From f3a2c217e8e40454a0f5b9416a2070f12479a5ee Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 12 May 2016 15:51:37 +0200 Subject: [PATCH 1/1] mail-big-homedirs: Work even when we cannot read /etc/dsa/pubsub.conf --- modules/porterbox/files/mail-big-homedirs | 40 +++++++++++++---------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs index 46b4b188d..73370e3e2 100755 --- a/modules/porterbox/files/mail-big-homedirs +++ b/modules/porterbox/files/mail-big-homedirs @@ -55,14 +55,17 @@ parser.add_option("-d", "--debug", (options, args) = parser.parse_args() options.section = 'dsa-homedirs' options.config = '/etc/dsa/pubsub.conf' -config = Config(options) -mq_conf = { - 'rabbit_userid': config.username, - 'rabbit_password': config.password, - 'rabbit_virtual_host': config.vhost, - 'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'], - 'use_ssl': False -} +if os.access(options.config, os.R_OK): + mq_config = Config(options) + mq_conf = { + 'rabbit_userid': mq_config.username, + 'rabbit_password': mq_config.password, + 'rabbit_virtual_host': mq_config.vhost, + 'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'], + 'use_ssl': False + } +else: + mq_config = None if options.dryrun: SENDMAIL_COMMAND = ['/bin/cat'] @@ -214,16 +217,17 @@ class HomedirReminder(object): 'lastlog': self.lastlog_times.get(user, 0), } - msg = { - 'timestamp': current_time, - 'data': data, - 'host': platform.node(), - } - conn = Connection(conf=mq_conf) - conn.topic_send(config.topic, - msg, - exchange_name=config.exchange, - timeout=5) + if mq_config is not None: + msg = { + 'timestamp': current_time, + 'data': data, + 'host': platform.node(), + } + conn = Connection(conf=mq_conf) + conn.topic_send(mq_config.topic, + msg, + exchange_name=mq_config.exchange, + timeout=5) except Exception, e: logging.error("Error sending: %s" % e) finally: -- 2.20.1