merge from origin/replsethandler_to_backup_py

Author: Tim Vaillancourt

MongoBackup/Replset.py

@@ -2,6 +2,8 @@
 
 from math import ceil
 
+from Common import DB
+
 
 class Replset:
     def __init__(self, db, user=None, password=None, authdb='admin', max_lag_secs=5):
@@ -18,10 +20,10 @@ def __init__(self, db, user=None, password=None, authdb='admin', max_lag_secs=5)
 
         # Get a DB connection
         try:
-            if self.db.__class__.__name__ == "DB":
+            if isinstance(self.db, DB):
                 self.connection = self.db.connection()
             else:
-                raise Exception, "'db' field is an instance of %s, not 'DB'!" % self.db.__class__.__name__, None
+                raise Exception, "'db' field is not an instance of class: 'DB'!", None
         except Exception, e:
             logging.fatal("Could not get DB connection! Error: %s" % e)
             raise e

MongoBackup/ReplsetSharded.py

@@ -18,17 +18,17 @@ def __init__(self, sharding, db, user=None, password=None, authdb='admin', max_l
         self.replset_conns = {}
 
         # Check Sharding class:
-        if not self.sharding.__class__.__name__ == "Sharding":
-            raise Exception, "'sharding' field is an instance of %s, not 'Sharding'!" % self.sharding.__class__.__name__, None
+        if not isinstance(self.sharding, Sharding):
+            raise Exception, "'sharding' field is not an instance of class: 'Sharding'!", None
 
         # Get a DB connection
         try:
-            if self.db.__class__.__name__ == "DB":
+            if isinstance(self.db, DB):
                 self.connection = self.db.connection()
                 if not self.connection.is_mongos:
                     raise Exception, 'MongoDB connection is not to a mongos!', None
             else:
-                raise Exception, "'db' field is an instance of %s, not 'DB'!" % self.db.__class__.__name__, None
+                raise Exception, "'db' field is not an instance of class: 'DB'!", None
         except Exception, e:
             logging.fatal("Could not get DB connection! Error: %s" % e)
             raise e

MongoBackup/Sharding.py

@@ -21,12 +21,12 @@ def __init__(self, db, user=None, password=None, authdb='admin', balancer_wait_s
 
         # Get a DB connection
         try:
-            if self.db.__class__.__name__ == "DB":
+            if isinstance(self.db, DB):
                 self.connection = self.db.connection()
                 if not self.connection.is_mongos:
                     raise Exception, 'MongoDB connection is not to a mongos!', None
             else:
-                raise Exception, "'db' field is an instance of %s, not 'DB'!" % self.db.__class__.__name__, None
+                raise Exception, "'db' field is not an instance of class: 'DB'!", None
         except Exception, e:
             logging.fatal("Could not get DB connection! Error: %s" % e)
             raise e