50: Tidy up

METdbLoad/ush/met_db_load.py

@@ -50,9 +50,6 @@ def main(args):
     begin_time = str(datetime.now())
 
     # setup a logger for this module
-
-    # Any loglevel set here will be overwirtten later if XML tag "verbose" is true.
-    #TODO: determine if we want to write to file instead of stout
     cli_loglevel = False
     if args.loglevel:
         loglevel = args.loglevel
@@ -322,8 +319,7 @@ def main(args):
             # move indices to the next set of files
             first_file, mid_file, last_file = next_set(mid_file, last_file)
 
-        except (RuntimeError, TypeError, NameError, KeyError) as e:
-            raise e
+        except (RuntimeError, TypeError, NameError, KeyError):
             logger.error("*** %s occurred in Main writing data ***", sys.exc_info()[0])
             sys.exit("*** Error when writing data to database")
 

METdbLoad/ush/run_sql.py

@@ -22,6 +22,7 @@
 import pymysql
 
 from METdbLoad.ush import constants as CN
+from METdbLoad.ush.met_db_load import DEFAULT_LOGLEVEL
 from METreformat.util import get_common_logger
 
 class RunSql:
@@ -36,7 +37,7 @@ def __init__(self, logger=None):
         self.conn = None
         self.cur = None
         if logger is None:
-            self.logger = get_common_logger('DEBUG', 'stdout')
+            self.logger = get_common_logger(DEFAULT_LOGLEVEL, 'stdout')
         else:
             self.logger = logger
 

METdbLoad/ush/write_file_sql.py

@@ -23,6 +23,7 @@
 
 from METdbLoad.ush import constants as CN
 from METdbLoad.ush.run_sql import RunSql
+from METdbLoad.ush.met_db_load import DEFAULT_LOGLEVEL
 from METreformat.util import get_common_logger
 
 class WriteFileSql:
@@ -34,7 +35,7 @@ class WriteFileSql:
     def __init__(self, logger=None):
         self.sql_met = RunSql()
         if logger is None:
-            self.logger = get_common_logger('DEBUG', 'stdout')
+            self.logger = get_common_logger(DEFAULT_LOGLEVEL, 'stdout')
         else:
             self.logger = logger