Changes in sasview/sasview.py [cde6e52:463e7ffc] in sasview

File:

• sasview/sasview.py (modified) (3 diffs)

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(__name__)
 
-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
@@ -148 +128 @@
             logging.error(traceback.format_exc())
 
+        # Corfunc perspective
+        try:
+            import sas.sasgui.perspectives.corfunc as module
+            corfunc_plug = module.Plugin()
+            self.gui.add_perspective(corfunc_plug)
+        except:
+            logging.error("Unable to load corfunc module")
+
         #Calculator perspective
         try:
@@ -155 +143 @@
         except:
             logging.error("%s: could not find Calculator plug-in module"% \
+                                                        APP_NAME)
+            logging.error(traceback.format_exc())
+
+        # File converter tool
+        try:
+            import sas.sasgui.perspectives.file_converter as module
+            converter_plug = module.Plugin()
+            self.gui.add_perspective(converter_plug)
+        except:
+            logging.error("%s: could not find File Converter plug-in module"% \
                                                         APP_NAME)
             logging.error(traceback.format_exc())