summaryrefslogtreecommitdiffstats
path: root/wallace/module_gpgencrypt.py
diff options
context:
space:
mode:
authorLiutauras Adomaitis <adomaitis@kolabsystems.com>2019-08-16 13:56:23 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2019-08-16 13:56:23 +0200
commit775aa79262cace87c2443475c11abb9e5b609fe4 (patch)
tree86be8e4251e9855abb22ae00f7ccf8446d0ec9cb /wallace/module_gpgencrypt.py
parent88a6fa3f29f9bd937186f9dceb8d880b8af7692b (diff)
downloadpykolab-775aa79262cace87c2443475c11abb9e5b609fe4.tar.gz
More logging in Wallace and --max-tasks per process option for wallaced
Summary: Given that part of https://git.kolab.org/D761 changes are obsolete after commit baeee0049f06430801a2d9940f875747e51be7f5 I still want to have some changes find their way in master. Test Plan: None Reviewers: vanmeeuwen Subscribers: petersen, machniak, vanmeeuwen Differential Revision: https://git.kolab.org/D791
Diffstat (limited to 'wallace/module_gpgencrypt.py')
-rw-r--r--wallace/module_gpgencrypt.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/wallace/module_gpgencrypt.py b/wallace/module_gpgencrypt.py
index 0337bf1..e623fe1 100644
--- a/wallace/module_gpgencrypt.py
+++ b/wallace/module_gpgencrypt.py
@@ -40,7 +40,9 @@ import pykolab
from pykolab.translate import _
-log = pykolab.getLogger('pykolab.wallace')
+log = pykolab.getLogger('pykolab.wallace/gpgencrypt')
+extra_log_params = {'qid': '-'}
+log = pykolab.logger.LoggerAdapter(log, extra_log_params)
conf = pykolab.getConf()
mybasepath = '/var/spool/pykolab/wallace/gpgencrypt/'
@@ -86,6 +88,13 @@ Content-Disposition: inline; filename=\"encrypted.asc\"\n\n"
return msg
def execute(*args, **kw):
+ global extra_log_params
+
+ # TODO: Test for correct call.
+ filepath = args[0]
+
+ extra_log_params['qid'] = os.path.basename(filepath)
+
if not os.path.isdir(mybasepath):
os.makedirs(mybasepath)
@@ -93,9 +102,6 @@ def execute(*args, **kw):
if not os.path.isdir(os.path.join(mybasepath, stage)):
os.makedirs(os.path.join(mybasepath, stage))
- # TODO: Test for correct call.
- filepath = args[0]
-
if kw.has_key('stage'):
log.debug(_("Issuing callback after processing to stage %s") % (kw['stage']), level=8)
log.debug(_("Testing cb_action_%s()") % (kw['stage']), level=8)