[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/gkeyldap/, gkeys-ldap/bin/, gkeys/gkeys/, gkeys-ldap/etc/

[Brian Dolbec]

commit:     9051881401cded4e405521d66da38287aa65f4ee
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 19:44:19 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 19:44:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=90518814

update-seeds.sh: Fix capability to push the log file to another url

 gkeys-ldap/bin/update-seeds.sh   | 1 +
 gkeys-ldap/etc/update-seeds.conf | 2 +-
 gkeys-ldap/gkeyldap/cli.py       | 2 ++
 gkeys/gkeys/log.py               | 9 +++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 502fca9..53dbd83 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -77,6 +77,7 @@ git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to 
commit updates"
 git push origin master || die " *** git push failed"
 
 echo "Pushing the log file to ${LOG_UPLOAD_URL}"
+LOG_FILE=$( cat "${LOG_DIR}/gkeys-ldap-lastlog" )
 scp "${LOG_DIR}/${LOG_FILE}" "${LOG_UPLOAD_URL}"  || die "Failed to upload 
logfile: ${LOG_FILE}"
 
 success "Successfully updated developer.seeds"

diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
index 94e65e8..15d14b5 100644
--- a/gkeys-ldap/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
@@ -15,4 +15,4 @@ export GKEYS_SIG="sig"
 export GKEYS_SIGN="gkeys"
 export LOG_UPLOAD_URL="dol...@dev.gentoo.org:~dolsen/public_html/gkey-logs/"
 export LOG_DIR="${GKEYS_DIR}/logs"
-export LOG_FILE="${GKEYS_LOG}"
+export LOG_FILE=""

diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
index f3add7c..f18b6de 100644
--- a/gkeys-ldap/gkeyldap/cli.py
+++ b/gkeys-ldap/gkeyldap/cli.py
@@ -11,6 +11,7 @@ from gkeys import __version__
 from gkeys.base import CliBase
 from gkeys.config import GKeysConfig
 from gkeyldap.actions import (Actions, Available_Actions, Action_Map)
+from gkeys.log import save_logname
 
 
 class Main(CliBase):
@@ -52,6 +53,7 @@ class Main(CliBase):
             args = self.parse_args(sys.argv[1:])
             ok = self.setup(args, 
os.path.join(self.config['configdir'],'gkeys.conf'))
         if ok:
+            save_logname()
             return self.run(args)
         return False
 

diff --git a/gkeys/gkeys/log.py b/gkeys/gkeys/log.py
index fad1f43..f9b7963 100644
--- a/gkeys/gkeys/log.py
+++ b/gkeys/gkeys/log.py
@@ -71,3 +71,12 @@ def set_logger(namespace=None, logpath='', level=None,
     logger.debug("Loggers initialized")
 
     return logger
+
+
+def save_logname():
+    global logname, NAMESPACE
+    _dir, name = os.path.split(logname)
+    with open(os.path.join(_dir, '%s-lastlog' % NAMESPACE), 'w') as last:
+        last.write(name)
+
+