Changeset 799963c in sasview

Timestamp:

Aug 13, 2018 11:13:27 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

328f2ef

Parents:

ecfe6b6

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (08/13/18 11:12:53)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (08/13/18 11:13:27)

Message:

add user config flag for disabling DEBUG logs

Files:

• run.py (modified) (1 diff)
• src/sas/logger_config.py (modified) (2 diffs)
• src/sas/sasview/custom_config.py (modified) (1 diff)

run.py

@@ -155 +155 @@
     # so logging can be done during initialization process too
     root = abspath(dirname(realpath(sys.argv[0])))
-    addpath(joinpath(root, 'src','sas'))
-    from logger_config import SetupLogger
+
+    addpath(joinpath(root, 'src'))
+    addpath(joinpath(root, '../sasmodels/')) # dependency (for loading custom_config.py during log setup)
+
+    from sas.logger_config import SetupLogger
     logger = SetupLogger(__name__).config_development()
 

src/sas/logger_config.py

@@ -7 +7 @@
 
 import pkg_resources
+
+from sas import get_custom_config
 
 '''
@@ -39 +41 @@
         logging.captureWarnings(True)
 
+        self._disable_debug_from_config()
+
         return logger
+
+    def _disable_debug_from_config(self):
+        '''disable DEBUG logs as per user configuration (DEBUG logs disabled by default)'''
+        disable_debug = True
+        custom_config = get_custom_config()
+
+        if hasattr(custom_config, "FILTER_DEBUG_LOGS"):
+            if type(custom_config.FILTER_DEBUG_LOGS) is bool:
+                disable_debug = custom_config.FILTER_DEBUG_LOGS
+            else:
+                logging.warning("FILTER_DEBUG_LOGS has invalid value in custom_config.py")
+
+        if disable_debug:
+            # logging.info("Note: DEBUG logs are disabled.")
+            logging.disable(logging.DEBUG)
 
     def _read_config_file(self):

src/sas/sasview/custom_config.py

@@ -16 +16 @@
 DEFAULT_PERSPECTIVE = "Fitting"
 SAS_OPENCL = "None"
+
+# Logging options
+FILTER_DEBUG_LOGS = True