Changeset c04fb72 in sasview


Ignore:
Timestamp:
Apr 10, 2017 7:33:54 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:
2a8b4756
Parents:
63c7d581
Message:

See if log works on Mac

Location:
sasview
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasview/logger_config.py

    r38beeab rc04fb72  
    99import os 
    1010import os.path 
     11import pkg_resources 
    1112 
    1213class SetupLogger(object): 
     
    1617 
    1718    def __init__(self, logger_name): 
    18         self.config_file = os.path.join(os.path.abspath( 
    19             os.path.dirname(__file__)), 'logging.ini') 
     19        self._find_config_file() 
    2020        self.name = logger_name 
    2121 
     
    5252        for name, _ in logging.Logger.manager.loggerDict.items(): 
    5353            logging.getLogger(name).setLevel(logging.DEBUG) 
     54 
     55    def _find_config_file(self, filename="logging.ini"): 
     56        ''' 
     57        ''' 
     58        for filepath in [ 
     59                os.path.join(os.path.abspath(os.path.dirname(__file__)), filename), 
     60                pkg_resources.resource_filename(__name__, filename), 
     61            ]: 
     62            if os.path.exists(filepath): 
     63                self.config_file = filepath 
     64                return 
     65        raise Exception("%s not found...", filename) 
     66 
  • sasview/setup_exe.py

    r8b645cc rc04fb72  
    239239    data_files.append(('.', [f])) 
    240240 
     241f = 'logging.ini' 
     242if os.path.isfile(f): 
     243    data_files.append(('.', [f])) 
     244 
    241245#f = 'default_categories.json' 
    242246#if os.path.isfile(f): 
  • sasview/setup_mac.py

    r959eb01 rc04fb72  
    6262 
    6363APP = ['sasview.py'] 
    64 DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py'] 
     64DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py', 'logging.ini'] 
    6565if os.path.isfile("BUILD_NUMBER"): 
    6666    DATA_FILES.append("BUILD_NUMBER") 
Note: See TracChangeset for help on using the changeset viewer.