Merge pull request #25 from timvaillancourt/2.4_optime_fix

Check if 'optime' is a dict for MongoDB 2.4 + 2.6 compatability

Author: dbmurphy

MongoBackup/ReplsetHandler.py

@@ -56,7 +56,7 @@ def find_desirable_secondary(self):
                     'optime': member['optimeDate']
                 }
                 optime = member['optime']
-                if 'ts' in member['optime']:
+                if isinstance(member['optime'], dict) and 'ts' in member['optime']:
                     optime = member['optime']['ts']
                 logging.debug("Found PRIMARY: %s/%s with optime %s" % (
                     rs_name,
@@ -102,7 +102,7 @@ def find_desirable_secondary(self):
                     log_msg = "Found SECONDARY %s/%s with too-high replication lag! Skipping" % (rs_name, member['name'])
 
                 log_data['optime'] = member['optime']
-                if 'ts' in member['optime']:
+                if isinstance(member['optime'], dict) and 'ts' in member['optime']:
                     log_data['optime'] = member['optime']['ts']
                 log_data['score']  = int(score)
                 logging.debug("%s: %s" % (log_msg, str(log_data)))

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1