"keyFingerPrint", "privateSub", "mailDisableMessage",\
"mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
"mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
- "mailContentInspectionAction", "webPassword", "rtcPassword"])
+ "mailContentInspectionAction", "webPassword", "rtcPassword",\
+ "bATVToken"])
if passwd_attrs is None:
raise UDEmptyList, "No Users"
return (cache_last_ldap_mod, cache_last_unix_mod, cache_last_run)
-def mq_notify(options):
+def mq_notify(options, message):
options.section = 'dsa-udgenerate'
options.config = '/etc/dsa/pubsub.conf'
'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'],
'use_ssl': False
}
+
+ msg = {
+ 'message': message,
+ 'timestamp': int(time.time())
+ }
conn = None
try:
conn = Connection(conf=conf)
conn.topic_send(config.topic,
- 'update',
+ json.dumps(msg),
exchange_name=config.exchange,
timeout=5)
finally:
need_update = (ldap_last_mod > cache_last_ldap_mod) or (unix_last_mod > cache_last_unix_mod) or (time_started - last_run > MAX_UD_AGE)
- if not options.force and not need_update:
- fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
- fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
- fd.close()
- sys.exit(0)
-
- tracefd = open(os.path.join(generate_dir, "last_update.trace"), "w")
- generate_all(generate_dir, l)
- tracefd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, time_started))
- tracefd.close()
- if options.mq:
- mq_notify(options)
+ fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
+ if need_update or options.force:
+ msg = 'Update forced' if options.force else 'Update needed'
+ generate_all(generate_dir, l)
+ if options.mq:
+ mq_notify(options, msg)
+ last_run = int(time.time())
+ fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
+ fd.close()
+ sys.exit(0)
if __name__ == "__main__":