Address a couple of old lint errors about missing variable init in configuration.py

mig/shared/configuration.py

@@ -1,3 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
@@ -20,7 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
 #
 # -- END_HEADER ---
 #
@@ -31,12 +32,12 @@
 from __future__ import print_function
 from future import standard_library
 from builtins import range
 from builtins import object
 
 import base64
 import copy
 import datetime
 import functools
 import inspect
 import os
 import pwd
@@ -69,7 +70,7 @@
         valid_filter_methods, default_twofactor_auth_apps, \
         mig_conf_section_dirname
     from mig.shared.logger import Logger, SYSLOG_GDP
     from mig.shared.htmlgen import menu_items, vgrid_items
     from mig.shared.fileio import read_file, load_json, write_file
 except ImportError as ioe:
     print("could not import migrid modules")
@@ -142,7 +143,7 @@
         return val
     # logger.debug("expand any ENV and FILE content in %r" % val)
     env_pattern = "[a-zA-Z][a-zA-Z0-9_]+"
     cache_pattern = file_pattern = "[^ ]+"
     expanded = val
     expand_pairs = [(keyword_env, env_pattern), (keyword_file, file_pattern)]
     for (key, pattern) in expand_pairs:
@@ -170,7 +171,7 @@
                     #    "reading conf content from file in %r" % cache)
                     content = read_file(path, logger)
                     if cache and content:
                         # logger.debug("caching conf content salt in %r" % cache)
                         write_file(content, cache, logger)
                 if not content:
                     logger.warning("salt file not found or empty: %s" % path)
@@ -191,7 +192,7 @@
     return expanded
 
 
 def fix_missing(config_file, verbose=True):
     """Add missing configuration options - used by checkconf script"""
 
     config = ConfigParser()
@@ -244,7 +245,7 @@
         'server_home': '~/state/server_home/',
         'webserver_home': '~/state/webserver_home/',
         'sessid_to_mrsl_link_home': '~/state/sessid_to_mrsl_link_home/',
         'sessid_to_jupyter_mount_link_home': '~/state/sessid_to_jupyter_mount_link_home/',
         'mig_system_files': '~/state/mig_system_files/',
         'mig_system_storage': '~/state/mig_system_storage',
         'mig_system_run': '~/state/mig_system_run/',
@@ -379,7 +380,7 @@
         'architectures': 'X86 AMD64 IA64 SPARC SPARC64 ITANIUM SUN4U SPARC-T1',
         'scriptlanguages': 'sh python java',
         'jobtypes': 'batch bulk all',
         'lrmstypes': 'Native Native-execution-leader Batch Batch-execution-leader',
     }
     scheduler_section = {'algorithm': 'FairFit',
                          'expire_after': '99999999999',
@@ -421,7 +422,7 @@
         'ACCOUNTING': accounting_section,
     }
     for section in defaults:
         if not section in config.sections():
             config.add_section(section)
 
     modified = False
@@ -435,7 +436,7 @@
                 modified = True
     if modified:
         backup_path = '%s.%d' % (config_file, time.time())
         print('Backing up existing configuration to %s as update removes all comments'
               % backup_path)
         fd = open(config_file, 'r')
         backup_fd = open(backup_path, 'w')
@@ -727,7 +728,7 @@
                        'VERIFYFILES', 'VGRID'],
     'job_cond_yellow': ['DISK', 'MEMORY', 'CPUTIME'],
     'job_cond_orange': ['CPUCOUNT', 'NODECOUNT'],
     'job_cond_red': ['EXECUTABLES', 'INPUTFILES', 'REGISTERED', 'SEEN_WITHIN_X'],
     'enable_suggest': False,
     'suggest_threshold': 'GREEN',
 
@@ -768,12 +769,14 @@
     def __init__(self, config_file, verbose=False, skip_log=False,
                  disable_auth_log=False):
         self.config_file = config_file
         self.mig_server_id = None
         # Explicitly init a few helpers hot-plugged and used in ways where it's
         # less obvious if they are always guaranteed to already be initialized.
         self.default_page = None
         self.auth_logger_obj = None
         self.gdp_logger_obj = None
+        self.logger_obj = None
+        self.logger = None
 
         configuration_properties = copy.deepcopy(_CONFIGURATION_PROPERTIES)
 
@@ -804,7 +807,7 @@
         try:
             if self.logger:
                 self.logger.info('reloading configuration and reopening log')
         except:
             pass
 
         try:
@@ -839,7 +842,7 @@
             self.log_dir = config.get('GLOBAL', 'log_dir')
             self.logfile = config.get('GLOBAL', 'logfile')
             self.loglevel = config.get('GLOBAL', 'loglevel')
         except:
 
             # Fall back to file in current dir
 
@@ -949,9 +952,9 @@
         # Mandatory options first
 
         try:
             self.mig_server_id = config.get('GLOBAL', 'mig_server_id')
             self.mrsl_files_dir = config.get('GLOBAL', 'mrsl_files_dir')
             self.re_files_dir = config.get('GLOBAL', 're_files_dir')
             self.re_pending_dir = config.get('GLOBAL', 're_pending_dir')
             self.re_home = config.get('GLOBAL', 're_home')
             self.grid_stdin = config.get('GLOBAL', 'grid_stdin')
@@ -989,7 +992,7 @@
             self.jobtypes = config.get('GLOBAL', 'jobtypes').split()
             self.lrmstypes = config.get('GLOBAL', 'lrmstypes').split()
             self.sessid_to_mrsl_link_home = config.get('GLOBAL',
                                                        'sessid_to_mrsl_link_home')
             self.mig_system_files = config.get('GLOBAL',
                                                'mig_system_files')
             self.mig_system_storage = config.get('GLOBAL',
@@ -1017,7 +1020,7 @@
         except Exception as err:
             try:
                 self.logger.error('Error in reloading configuration: %s' % err)
             except:
                 pass
             raise Exception('Failed to parse configuration: %s' % err)