make method to check to enable ssl or not, check if bool or str with isinstance()

Author: timvaillancourt

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -57,6 +57,13 @@ def close(self, exit_code=None, frame=None):
             self._command.close()
         sys.exit(self.exit_code)
 
+    def do_ssl(self):
+        if isinstance(self.ssl_enabled, bool):
+            return self.ssl_enabled
+        elif isinstance(self.ssl_enabled, str) and self.ssl_enabled.rstrip().lower() is "true":
+            return True
+        return False
+
     def parse_mongodump_line(self, line):
         try:
             line = line.rstrip()
@@ -138,7 +145,7 @@ def mongodump_cmd(self):
             else:
                 logging.warning("Mongodump is too old to set password securely! Upgrade to mongodump >= 3.0.2 to resolve this")
                 mongodump_flags.extend(["-u", self.user, "-p", self.password])
-        if self.ssl_enabled is True or self.ssl_enabled.rstrip().lower() is "true":
+        if self.do_ssl():
             mongodump_flags.append("--ssl")
             if self.ssl_ca_file:
                 mongodump_flags.extend(["--sslCAFile", self.ssl_ca_file])

mongodb_consistent_backup/Common/DB.py

@@ -36,6 +36,13 @@ def __init__(self, uri, config, do_replset=False, read_pref='primaryPreferred',
         self.connect()
         self.auth_if_required()
 
+    def do_ssl(self):
+        if isinstance(self.ssl_enabled, bool):
+            return self.ssl_enabled
+        elif isinstance(self.ssl_enabled, str) and self.ssl_enabled.rstrip().lower() is "true":
+            return True
+        return False
+
     def client_opts(self):
         opts = {
             "connect":                  self.do_connect,
@@ -51,7 +58,7 @@ def client_opts(self):
                 "readPreference": self.read_pref,
                 "w":              "majority"
             })
-        if self.ssl_enabled is True or self.ssl_enabled.rstrip().lower() is "true":
+        if self.do_ssl():
             logging.debug("Enabling SSL security on database connection")
             opts.update({
                 "ssl":           True,