From 618bbbe34f27d1ab188ef670578988d36e107c8c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 20 Jul 2016 16:06:36 -0400 Subject: [PATCH] Log tidying. --- rida.conf | 4 ++-- rida/builder.py | 2 +- rida/scheduler/main.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rida.conf b/rida.conf index dd332951..c17aa37f 100644 --- a/rida.conf +++ b/rida.conf @@ -1,9 +1,9 @@ [DEFAULT] system = koji messaging = fedmsg -koji_config = /etc/rida/koji.conf +koji_config = ~/.koji/config # See https://fedoraproject.org/wiki/Koji/WritingKojiCode#Profiles -koji_profile = koji +koji_profile = staging koji_arches = ["x86_64"] db = sqlite:///rida.db pdc_url = http://modularity.fedorainfracloud.org:8080/rest_api/v1/ diff --git a/rida/builder.py b/rida/builder.py index 314fe1f7..03977769 100644 --- a/rida/builder.py +++ b/rida/builder.py @@ -291,7 +291,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macro.modules koji_config.krbservice = krbservice address = koji_config.server - log.info("Connecting to koji %r, %r" % (address, koji_config)) + log.info("Connecting to koji %r" % address) koji_session = koji.ClientSession(address, opts=vars(koji_config)) authtype = koji_config.authtype diff --git a/rida/scheduler/main.py b/rida/scheduler/main.py index 0ffd80a6..8b28f7c6 100644 --- a/rida/scheduler/main.py +++ b/rida/scheduler/main.py @@ -175,9 +175,10 @@ class MessageWorker(threading.Thread): # Execute our chosen handler with rida.database.Database(config) as session: - log.info(" %r: %s, %s" % (handler, msg['topic'], msg['msg_id'])) + log.info(" %s: %s, %s" % (handler.__name__, msg['topic'], msg['msg_id'])) handler(config, session, msg) + class Poller(threading.Thread): def __init__(self, outgoing_work_queue, *args, **kwargs): self.outgoing_work_queue = outgoing_work_queue