| 1 |
commit: 9051881401cded4e405521d66da38287aa65f4ee |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 6 19:44:19 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 6 19:44:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=90518814 |
| 7 |
|
| 8 |
update-seeds.sh: Fix capability to push the log file to another url |
| 9 |
|
| 10 |
gkeys-ldap/bin/update-seeds.sh | 1 + |
| 11 |
gkeys-ldap/etc/update-seeds.conf | 2 +- |
| 12 |
gkeys-ldap/gkeyldap/cli.py | 2 ++ |
| 13 |
gkeys/gkeys/log.py | 9 +++++++++ |
| 14 |
4 files changed, 13 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh |
| 17 |
index 502fca9..53dbd83 100755 |
| 18 |
--- a/gkeys-ldap/bin/update-seeds.sh |
| 19 |
+++ b/gkeys-ldap/bin/update-seeds.sh |
| 20 |
@@ -77,6 +77,7 @@ git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates" |
| 21 |
git push origin master || die " *** git push failed" |
| 22 |
|
| 23 |
echo "Pushing the log file to ${LOG_UPLOAD_URL}" |
| 24 |
+LOG_FILE=$( cat "${LOG_DIR}/gkeys-ldap-lastlog" ) |
| 25 |
scp "${LOG_DIR}/${LOG_FILE}" "${LOG_UPLOAD_URL}" || die "Failed to upload logfile: ${LOG_FILE}" |
| 26 |
|
| 27 |
success "Successfully updated developer.seeds" |
| 28 |
|
| 29 |
diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf |
| 30 |
index 94e65e8..15d14b5 100644 |
| 31 |
--- a/gkeys-ldap/etc/update-seeds.conf |
| 32 |
+++ b/gkeys-ldap/etc/update-seeds.conf |
| 33 |
@@ -15,4 +15,4 @@ export GKEYS_SIG="sig" |
| 34 |
export GKEYS_SIGN="gkeys" |
| 35 |
export LOG_UPLOAD_URL="dolsen@××××××××××.org:~dolsen/public_html/gkey-logs/" |
| 36 |
export LOG_DIR="${GKEYS_DIR}/logs" |
| 37 |
-export LOG_FILE="${GKEYS_LOG}" |
| 38 |
+export LOG_FILE="" |
| 39 |
|
| 40 |
diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py |
| 41 |
index f3add7c..f18b6de 100644 |
| 42 |
--- a/gkeys-ldap/gkeyldap/cli.py |
| 43 |
+++ b/gkeys-ldap/gkeyldap/cli.py |
| 44 |
@@ -11,6 +11,7 @@ from gkeys import __version__ |
| 45 |
from gkeys.base import CliBase |
| 46 |
from gkeys.config import GKeysConfig |
| 47 |
from gkeyldap.actions import (Actions, Available_Actions, Action_Map) |
| 48 |
+from gkeys.log import save_logname |
| 49 |
|
| 50 |
|
| 51 |
class Main(CliBase): |
| 52 |
@@ -52,6 +53,7 @@ class Main(CliBase): |
| 53 |
args = self.parse_args(sys.argv[1:]) |
| 54 |
ok = self.setup(args, os.path.join(self.config['configdir'],'gkeys.conf')) |
| 55 |
if ok: |
| 56 |
+ save_logname() |
| 57 |
return self.run(args) |
| 58 |
return False |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/gkeys/gkeys/log.py b/gkeys/gkeys/log.py |
| 62 |
index fad1f43..f9b7963 100644 |
| 63 |
--- a/gkeys/gkeys/log.py |
| 64 |
+++ b/gkeys/gkeys/log.py |
| 65 |
@@ -71,3 +71,12 @@ def set_logger(namespace=None, logpath='', level=None, |
| 66 |
logger.debug("Loggers initialized") |
| 67 |
|
| 68 |
return logger |
| 69 |
+ |
| 70 |
+ |
| 71 |
+def save_logname(): |
| 72 |
+ global logname, NAMESPACE |
| 73 |
+ _dir, name = os.path.split(logname) |
| 74 |
+ with open(os.path.join(_dir, '%s-lastlog' % NAMESPACE), 'w') as last: |
| 75 |
+ last.write(name) |
| 76 |
+ |
| 77 |
+ |
Archives