Changeset c04fb72 in sasview

Timestamp:

Apr 10, 2017 9:33:54 AM (8 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:

2a8b4756

Parents:

63c7d581

Message:

See if log works on Mac

Location:

sasview

Files:

• logger_config.py (modified) (3 diffs)
• setup_exe.py (modified) (1 diff)
• setup_mac.py (modified) (1 diff)

sasview/logger_config.py

@@ -9 +9 @@
 import os
 import os.path
+import pkg_resources
 
 class SetupLogger(object):
@@ -16 +17 @@
 
     def __init__(self, logger_name):
-        self.config_file = os.path.join(os.path.abspath(
-            os.path.dirname(__file__)), 'logging.ini')
+        self._find_config_file()
         self.name = logger_name
 
@@ -52 +52 @@
         for name, _ in logging.Logger.manager.loggerDict.items():
             logging.getLogger(name).setLevel(logging.DEBUG)
+
+    def _find_config_file(self, filename="logging.ini"):
+        '''
+        '''
+        for filepath in [
+                os.path.join(os.path.abspath(os.path.dirname(__file__)), filename),
+                pkg_resources.resource_filename(__name__, filename),
+            ]:
+            if os.path.exists(filepath):
+                self.config_file = filepath
+                return
+        raise Exception("%s not found...", filename)
+

sasview/setup_exe.py

@@ -239 +239 @@
     data_files.append(('.', [f]))
 
+f = 'logging.ini'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
+
 #f = 'default_categories.json'
 #if os.path.isfile(f):

sasview/setup_mac.py

@@ -62 +62 @@
 
 APP = ['sasview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py', 'logging.ini']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")