Changeset 797a2e8 in sasview

Timestamp:

Apr 9, 2017 1:47:49 AM (7 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

64ff687

Parents:

38beeab (diff), ec65dc81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:SasView/sasview into pytest

Files:

• docs/pandoc-docs/Makefile (added)
• docs/pandoc-docs/build_pandoc.py (added)
• docs/pandoc-docs/source/README.txt (added)
• sasview/media/README.txt (modified) (1 diff)
• run.py (modified) (2 diffs)
• sasview/logger_config.py (added)
• sasview/logging.ini (modified) (4 diffs)
• sasview/sasview.py (modified) (2 diffs)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (5 diffs)

sasview/media/README.txt

@@ -2 +2 @@
 in the menu bar.
 
-The source files are in: /SasViewLocalTrunk/docs/sasview
+The source files are in: /sasview/docs/sasview

run.py

@@ -14 +14 @@
 """
 
-import os
-import sys
 import imp
 import logging
 import logging.config
+import os
+import sys
+from contextlib import contextmanager
+from os.path import join as joinpath
+from os.path import abspath, dirname
 
-from contextlib import contextmanager
-from os.path import abspath, dirname, join as joinpath
+from sasview.logger_config import SetupLogger
 
+l = SetupLogger(__name__)
+logger = l.config_development()
 
-LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'sasview/logging.ini')
-logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=True)
-logger = logging.getLogger(__name__)
-
-def update_all_logs_to_debug(logger):
-    '''
-    This updates all loggers and respective handlers to DEBUG
-    '''
-    for handler in logger.handlers or logger.parent.handlers:
-        handler.setLevel(logging.DEBUG)
-    for name,_ in logging.Logger.manager.loggerDict.items():
-        logging.getLogger(name).setLevel(logging.DEBUG)
-        
 def addpath(path):
     """
@@ -154 +145 @@
 
 if __name__ == "__main__":
-    update_all_logs_to_debug(logger)
+    logger.debug("Starting SASVIEW in debug mode.")
     prepare()
     from sas.sasview.sasview import run
     run()
-    
+    logger.debug("Ending SASVIEW in debug mode.")

sasview/logging.ini

@@ -16 +16 @@
 
 [formatter_detailed]
-format=%(asctime)s:%(name)s:%(levelname)s: %(lineno)d: %(message)s
+format=%(asctime)s : %(levelname)s : %(name)s: %(lineno)d: %(message)s
 
 ###############################################################################
@@ -27 +27 @@
 class=logging.StreamHandler
 formatter=simple
-level=INFO
+level=WARNING
 args=tuple()
 
 [handler_log_file]
 class=logging.FileHandler
-level=INFO
+level=DEBUG
 formatter=detailed
 args=(os.path.join(os.path.expanduser("~"),'sasview.log'),"a")
@@ -43 +43 @@
 
 [logger_root]
-level=INFO
+level=DEBUG
 formatter=default
 handlers=console,log_file
@@ -60 +60 @@
 
 [logger_sasgui]
-level=INFO
+level=DEBUG
 qualname=sas.sasgui
 handlers=console,log_file

sasview/sasview.py

@@ -12 +12 @@
 ################################################################################
 import os
+import os.path
 import sys
 import logging
@@ -17 +18 @@
 import traceback
 
-logger = logging.getLogger(__name__)
-if not logger.root.handlers:
-    LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini')
-    logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False)
-    logging.captureWarnings(True)
+from logger_config import SetupLogger
+
+l = SetupLogger(__name__)
+logger = l.config_production()
 
 # Log the start of the session

src/sas/sasgui/guiframe/gui_manager.py

@@ -77 +77 @@
     # clean all these module variables and put them into a config class
     # that can be passed by sasview.py.
-    logger.info(sys.executable)
-    logger.info(str(sys.argv))
+    logger.debug(sys.executable)
+    logger.debug(str(sys.argv))
     from sas import sasview as sasview
     app_path = os.path.dirname(sasview.__file__)
-    logger.info("Using application path: %s", app_path)
+    logger.debug("Using application path: %s", app_path)
     return app_path
 
@@ -109 +109 @@
         if fObj is not None:
             fObj.close()
-    logger.info("GuiManager loaded %s/%s" % (path, file))
+    logger.debug("GuiManager loaded %s/%s" % (path, file))
     return config_module
 
@@ -126 +126 @@
         # Didn't find local config, load the default
         import sas.sasgui.guiframe.config as config
-        logger.info("using default local_config")
+        logger.debug("using default local_config")
     else:
-        logger.info("found local_config in %s" % os.getcwd())
+        logger.debug("found local_config in %s" % os.getcwd())
 else:
-    logger.info("found local_config in %s" % PATH_APP)
+    logger.debug("found local_config in %s" % PATH_APP)
 
 from sas.sasgui.guiframe.customdir import SetupCustom
@@ -139 +139 @@
     if custom_config is None:
         msgConfig = "Custom_config file was not imported"
-        logger.info(msgConfig)
+        logger.debug(msgConfig)
     else:
-        logger.info("using custom_config in %s" % os.getcwd())
+        logger.debug("using custom_config in %s" % os.getcwd())
 else:
-    logger.info("using custom_config from %s" % c_conf_dir)
+    logger.debug("using custom_config from %s" % c_conf_dir)
 
 # read some constants from config
@@ -2156 +2156 @@
         if response is not None:
             try:
-                # 
                 content = response.read().strip()
-                logger.info("Connected to www.sasview.org. Latest version: %s"
-                             % (content))
+                logger.info("Connected to www.sasview.org. Latest version: %s", content)
                 version_info = json.loads(content)
             except: