gmoccapy: order log levels in code, add -w option to set log level explicitly to WARNING (=default)

Author: hansu

configs/sim/gmoccapy/gmoccapy.ini

@@ -10,11 +10,12 @@ DEBUG = 0
 
 # Sections for display options ------------------------------------------------
 [DISPLAY]
-DISPLAY = gmoccapy -i
+DISPLAY = gmoccapy
 # Log level:
+# VERBOSE     -v
 # DEBUG       -d
 # INFO        -i
-# VERBOSE     -v
+# WARNING     -w (default)
 # ERROR       -q
 
 # Cycle time, in milliseconds, that display will sleep between polls

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -6338,21 +6338,21 @@ def _make_hal_pins(self):
     from common import logger
     LOG = logger.initBaseLogger('Gmoccapy', log_file=None, log_level=logger.WARNING)
 
-    # we set the log level early so the imported modules get the right level
+    # We set the log level early so the imported modules get the right level.
     # The order is: VERBOSE, DEBUG, INFO, WARNING, ERROR, CRITICAL.
+    # The log level defaults to WARNING.
 
-    if '-d' in sys.argv:
-        # Log level defaults to WARNING, so set lower if in debug mode
+    if '-v' in sys.argv:
+        logger.setGlobalLevel(logger.VERBOSE)
+        LOG.info('VERBOSE logging on')
+    elif '-d' in sys.argv:
         logger.setGlobalLevel(logger.DEBUG)
-        LOG.debug('DEBUGGING logging on')
+        LOG.info('DEBUGGING logging on')
     elif '-i' in sys.argv:
-        # Log level defaults to WARNING, so set lower if in info mode
         logger.setGlobalLevel(logger.INFO)
         LOG.info('INFO logging on')
-    elif '-v' in sys.argv:
-        # Log level defaults to WARNING, so set lowest if in verbose mode
-        logger.setGlobalLevel(logger.VERBOSE)
-        LOG.verbose('VERBOSE logging on')
+    elif '-w' in sys.argv:
+        logger.setGlobalLevel(logger.WARNING)
     elif '-q' in sys.argv:
         logger.setGlobalLevel(logger.ERROR)