commit: 3cbba703e8309d7dea5728ab8f9ad4d6b6b8eaf3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 15 17:36:43 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 31 04:39:42 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=3cbba703
gkeys-ldap: Add saving the logfilename to know which log file to push
Add uploading the log file to my dev space for public access.
cgh
---
gkeys-ldap/bin/update-seeds.sh | 3 +++
gkeys-ldap/etc/update-seeds.conf | 3 +++
gkeys-ldap/gkeyldap/cli.py | 2 +-
gkeys/gkeys/log.py | 3 ++-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index f096cb8..502fca9 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -76,5 +76,8 @@ git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add
${GKEYS_SEEDS}.sig
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}"
+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 5b87b48..94e65e8 100644
--- a/gkeys-ldap/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
@@ -13,3 +13,6 @@ export GKEYS_COMMIT_MSG="Gentoo-keys: Update
gentoo-devs.seeds"
export GKEYS_SEEDS="seeds/gentoo-devs.seeds"
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}"
diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
index b134ed9..f3add7c 100644
--- a/gkeys-ldap/gkeyldap/cli.py
+++ b/gkeys-ldap/gkeyldap/cli.py
@@ -33,7 +33,7 @@ class Main(CliBase):
'Actions': Actions,
'Available_Actions': Available_Actions,
'Action_Map': Action_Map,
- 'prog': 'gkey-ldap',
+ 'prog': 'gkeys-ldap',
'description': 'Gentoo-keys LDAP interface and seed file generator
program',
'epilog': '''CAUTION: adding UNTRUSTED keys can be HAZARDOUS to
your system!'''
}
diff --git a/gkeys/gkeys/log.py b/gkeys/gkeys/log.py
index a16767e..fad1f43 100644
--- a/gkeys/gkeys/log.py
+++ b/gkeys/gkeys/log.py
@@ -20,6 +20,7 @@ from gkeys.fileops import ensure_dirs
NAMESPACE = 'gentoo-keys'
logger = None
Console_handler = None
+logname = None
log_levels = {
'CRITICAL': logging.CRITICAL,
@@ -35,7 +36,7 @@ log_levels = {
def set_logger(namespace=None, logpath='', level=None,
dirmode=0o775, filemask=0o002):
- global logger, NAMESPACE, Console_handler
+ global logger, NAMESPACE, Console_handler, logname
if not namespace:
namespace = NAMESPACE
else:
