X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=49ef0d0905425a70548fc3dfa4d296a20cf558b7;hb=a2927700ed9ea5fd6eac7120794bb7c5d5a44ddb;hp=d39a84cb300b2c1ee217dd8026403cd058ea9024;hpb=248c5368a842fa9b6551cd87993e96e3f7829df8;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index d39a84c..49ef0d0 100755
--- a/ud-generate
+++ b/ud-generate
@@ -1105,7 +1105,8 @@ def get_accounts(ldap_conn):
                     "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"
@@ -1385,7 +1386,7 @@ def getLastBuildTime(gdir):
 
    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'
 
@@ -1397,11 +1398,16 @@ def mq_notify(options):
       '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:
@@ -1414,8 +1420,6 @@ def ud_generate():
      help="Output directory.")
    parser.add_option("-f", "--force", dest="force", action="store_true",
      help="Force generation, even if no update to LDAP has happened.")
-   parser.add_option("-m", "--mq", action="store_true", default=False,
-     help="Send update trigger over MQ")
 
    (options, args) = parser.parse_args()
    if len(args) > 0:
@@ -1447,9 +1451,10 @@ def ud_generate():
 
    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)
+      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)