Changeset 6722fae in sasview

Timestamp:

Apr 4, 2017 11:09:16 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:

c155a16

Parents:

7cbbacd

Message:

Initial logging.ini conf

Files:

• .gitignore (modified) (1 diff)
• sasview/logging.ini (added)
• sasview/sasview.py (modified) (1 diff)

.gitignore

@@ -60 +60 @@
 # autogenerated scripts
 /sasview/installer.iss
+
+# Editor files
+.vscode/
+

sasview/sasview.py

@@ -14 +14 @@
 import sys
 import logging
+import logging.config
 import traceback
 
-logging.basicConfig(level=logging.INFO,
-                    format='%(asctime)s %(levelname)s %(message)s',
-                    filename=os.path.join(os.path.expanduser("~"),
-                                          'sasview.log'))
+
+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)
+logger = logging.getLogger()
 
-class StreamToLogger(object):
-    """
-        File-like stream object that redirects writes to a logger instance.
-    """
-    def __init__(self, logger, log_level=logging.INFO):
-        self.logger = logger
-        self.log_level = log_level
-        self.linebuf = ''
-
-    def write(self, buf):
-        """
-        Main logging method
-        """
-        # Write the message to stdout so we can see it when running interactively
-        sys.stdout.write(buf)
-        for line in buf.rstrip().splitlines():
-            self.logger.log(self.log_level, line.rstrip())
-
-stderr_logger = logging.getLogger('STDERR')
-sl = StreamToLogger(stderr_logger, logging.ERROR)
-sys.stderr = sl
 
 # Log the start of the session