record start time before starting

bin/sync_django_ldap.py

@@ -67,11 +67,15 @@ def main():
         try:
             last_timestamp = read_timestamp(SYNC_TIMESTAMP_FILENAME)
         except Exception:
-            _log.warning("Something broke reading the timestamp from %s" % SYNC_TIMESTAMP_FILENAME)
+            _log.warning("Something broke reading the timestamp from %s", SYNC_TIMESTAMP_FILENAME)
             last_timestamp = "201707230000Z"
-            _log.warning("We will resync from a while back : %s" % (last_timestamp,))
+            _log.warning("We will resync from a while back : %s", last_timestamp)
 
-    _log.info("Using timestamp %s" % (last_timestamp))
+    _log.info("Using timestamp %s", last_timestamp)
+    # record starttime before starting, and take a 10 sec safety buffer so we don't get gaps where users are approved
+    # in between the requesting of modified users and writing out the start time
+    start_time = datetime.now() - 10
+    _log.info("startime %s", start_time)
 
     try:
         parent_pid = os.fork()
@@ -135,7 +139,7 @@ def main():
 
         if not result:
             if not opts.options.start_timestamp:
-                (_, ldap_timestamp) = convert_timestamp(datetime.now())
+                (_, ldap_timestamp) = convert_timestamp(start_time)
                 if not opts.options.dry_run:
                     write_timestamp(SYNC_TIMESTAMP_FILENAME, ldap_timestamp)
             else:

setup.py

@@ -24,7 +24,7 @@
 from vsc.install.shared_setup import ag, jt
 
 PACKAGE = {
-    'version': '1.0.9',
+    'version': '1.0.10',
     'author': [ag, jt],
     'maintainer': [ag, jt],
     'tests_require': ['mock'],