filename simplifying for ReplsetHandler.py and ShardingHandler.py

Author: Tim Vaillancourt

MongoBackup/Backup.py

@@ -13,8 +13,8 @@
 from Methods import Mongodumper
 from Notify import NotifyNSCA
 from Oplog import OplogTailer, OplogResolver
-from ReplsetHandler import ReplsetHandler, ReplsetHandlerSharded
-from ShardingHandler import ShardingHandler
+from Replset import Replset, ReplsetSharded
+from Sharding import Sharding
 from Upload import UploadS3
 
 
@@ -185,7 +185,7 @@ def run(self):
 
             # get shard secondary
             try:
-                self.replset = ReplsetHandler(
+                self.replset = Replset(
                     self.db,
                     self.user,
                     self.password,
@@ -221,7 +221,7 @@ def run(self):
 
             # connect to balancer and stop it
             try:
-                self.sharding = ShardingHandler(
+                self.sharding = Sharding(
                     self.db,
                     self.user,
                     self.password,
@@ -236,7 +236,7 @@ def run(self):
 
             # get shard secondaries
             try:
-                self.replset = ReplsetHandlerSharded(
+                self.replset = ReplsetSharded(
                     self.sharding,
                     self.db,
                     self.user,

MongoBackup/ReplsetHandler.py renamed to MongoBackup/Replset.py

@@ -4,10 +4,10 @@
 from time import mktime
 
 from Common import DB
-from ShardingHandler import ShardingHandler
+from Sharding import Sharding
 
 
-class ReplsetHandler:
+class Replset:
     def __init__(self, db, user, password, authdb, max_lag_secs):
         self.db           = db
         self.user         = user
@@ -120,7 +120,7 @@ def find_secondary(self):
         return secondary
 
 
-class ReplsetHandlerSharded:
+class ReplsetSharded:
     def __init__(self, sharding, db, user, password, authdb, max_lag_secs):
         self.sharding     = sharding
         self.db           = db
@@ -131,9 +131,9 @@ def __init__(self, sharding, db, user, password, authdb, max_lag_secs):
 
         self.replset = None
 
-        # Check ShardingHandler class:
-        if not self.sharding.__class__.__name__ == "ShardingHandler":
-            raise Exception, "'sharding' field is an instance of %s, not 'ShardingHandler'!" % self.sharding.__class__.__name__, None
+        # 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
 
         # Get a DB connection
         try:
@@ -155,7 +155,7 @@ def find_secondaries(self):
                 host, port          = members.split(',')[0].split(":")
 
                 db           = DB(host, port, self.user, self.password, self.authdb) 
-                self.replset = ReplsetHandler(db, self.user, self.password, self.authdb, self.max_lag_secs)
+                self.replset = Replset(db, self.user, self.password, self.authdb, self.max_lag_secs)
                 secondary    = self.replset.find_secondary()
                 shard_secondaries[shard_name] = secondary
 

MongoBackup/ShardingHandler.py renamed to MongoBackup/Sharding.py

@@ -3,7 +3,7 @@
 from time import sleep
 
 
-class ShardingHandler:
+class Sharding:
     def __init__(self, db, user=None, password=None, authdb='admin', balancer_wait_secs=300, balancer_sleep=10):
         self.db                 = db
         self.user               = user