WiP: address a number of old linting errors in mig/server/X.py

mig/server/grid_events.py

@@ -20,7 +20,7 @@
 #
 # 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.
 #
 # -- END_HEADER ---
 #
@@ -69,7 +69,7 @@
         from scandir import scandir, __version__ as scandir_version
         if StrictVersion(scandir_version) < StrictVersion("1.3"):
 
             # Important os.walk compatibility utf8 fixes were not added until 1.3
 
             raise ImportError('scandir version is too old >= 1.3 required')
     except ImportError as exc:
@@ -90,7 +90,7 @@
     from mig.shared.logger import daemon_logger, register_hangup_handler
     from mig.shared.safeinput import PARAM_START, PARAM_STOP, PARAM_JUMP
     from mig.shared.serial import load
     from mig.shared.vgrid import vgrid_valid_entities, vgrid_add_workflow_jobs, \
         JOB_ID, JOB_CLIENT
     from mig.shared.vgridaccess import check_vgrid_access
     from mig.shared.workflows import get_wp_map, CONF
@@ -100,8 +100,8 @@
 
 # Global trigger rule dictionaries with rules for all VGrids
 
 all_rules = {}
 rule_hits = {}
 dir_cache = {}
 
 # Global miss cache to avoid wasting energy on repeated events without triggers
@@ -110,15 +110,15 @@
 
 # Global state helpers used in a number of functions and methods
 
 shared_state = {}
 shared_state['base_dir'] = None
 shared_state['base_dir_len'] = 0
 shared_state['writable_dir'] = None
 shared_state['writable_dir_len'] = 0
 shared_state['file_inotify'] = None
 shared_state['file_handler'] = None
 shared_state['rule_handler'] = None
 shared_state['rule_inotify'] = None
 
 # Only cache rule misses for one minute at a time to catch rule updates.
 # Run complete expire cycle if miss cache exceeds expire size.
@@ -530,7 +530,7 @@
 
         if state == 'created':
 
             # logger.debug('(%s) Updating rule monitor for src_path: %s, event: %s'
             #              % (pid, src_path, state))
 
             print('(%s) Updating rule monitor for src_path: %s, event: %s'
@@ -554,7 +554,7 @@
                     for ent in scandir(src_path):
                         if ent.is_dir(follow_symlinks=True):
 
                             # logger.debug('(%s) Dispatch DirCreatedEvent for: %s'
                             #         % (pid, ent.path))
 
                             shared_state['rule_handler'].dispatch(
@@ -562,14 +562,14 @@
                         elif ent.path.find(configuration.vgrid_triggers) \
                                 > -1:
 
                             # logger.debug('(%s) Dispatch FileCreatedEvent for: %s'
                             #         % (pid, ent.path))
 
                             shared_state['rule_handler'].dispatch(
                                 FileCreatedEvent(ent.path))
 
                 # else:
                 #    logger.debug('(%s) rule_monitor watch already exists for: %s'
                 #                  % (pid, src_path))
         # else:
         #    logger.debug('(%s) unhandled event: %s for: %s' % (pid,
@@ -605,7 +605,7 @@
             except Exception as exc:
                 new_rules = []
                 if state != 'deleted':
                     logger.error('(%s) failed to load event handler rules from %s (%s)'
                                  % (pid, src_path, exc))
 
             # logger.debug("(%s) loaded new rules from '%s':\n%s" % (pid,
@@ -616,7 +616,7 @@
 
             for target_path in all_rules:
                 all_rules[target_path] = [i for i in
                                           all_rules[target_path] if i['vgrid_name']
                                           != vgrid_name]
                 remain_rules = [i for i in all_rules[target_path]
                                 if i['vgrid_name'] != vgrid_name]
@@ -973,7 +973,7 @@
                     # created.
                     if pattern['parameterize_over']:
                         all_values = []
                         for (var, sweep) in pattern['parameterize_over'].items():
 
                             start = float(sweep[PARAM_START])
                             stop = float(sweep[PARAM_STOP])
@@ -2000,8 +2000,8 @@
         # else:
         #    logger.debug('Skipping _NON_ vgrid: %s' % ent.path)
 
     for monitor in vgrid_monitors.values():
         monitor.start()
 
     logger.debug('(%s) Starting main loop' % main_pid)
     print("%s: Start main loop" % os.getpid())
@@ -2044,3 +2044,4 @@
     logger.info('(%s) Event handler daemon shutting down' % main_pid)
 
     sys.exit(0)
+

mig/server/grid_ftps.py

@@ -619,3 +619,4 @@ def start_service(conf):
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_openid.py

@@ -1792,3 +1792,4 @@ def start_service(configuration):
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_script.py

@@ -1742,3 +1742,4 @@ def graceful_shutdown():
     sys.stdout.flush()
     loop_counter += 1
     logger.debug('loop ended')
+

mig/server/grid_sftp.py

@@ -2135,3 +2135,4 @@ def start_service(configuration):
     info_msg = "Leaving with no more workers active"
     logger.info(info_msg)
     print(info_msg)
+

mig/server/grid_webdavs-3.x.py

@@ -2139,3 +2139,4 @@ def run(configuration):
     except Exception as exc:
         logger.error("exiting on unexpected exception: %s" % exc)
         logger.info(traceback.format_exc())
+