evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure log dir is created, refine py2exe operation

Browse Source
This commit is contained in:
sqlcoder 2010-02-08 22:43:15 +00:00
parent 9201364055
commit 7294d2e5c0
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pyfpdb/Configuration.py
View File

@ -65,7 +65,7 @@ def get_exec_path():
def get_config(file_name, fallback = True): def get_config(file_name, fallback = True):
"""Looks in cwd and in self.default_config_path for a config file.""" """Looks in cwd and in self.default_config_path for a config file."""
exec_dir = get_exec_path() exec_dir = get_exec_path()
if file_name == 'logging.conf': if file_name == 'logging.conf' and sys.argv[0] != 'fpdb.exe':
config_path = os.path.join(exec_dir, 'pyfpdb', file_name) config_path = os.path.join(exec_dir, 'pyfpdb', file_name)
else: else:
config_path = os.path.join(exec_dir, file_name) config_path = os.path.join(exec_dir, file_name)
@ -105,26 +105,31 @@ def get_config(file_name, fallback = True):
sys.exit() sys.exit()
return (file_name,True) return (file_name,True)
def get_logger(file_name, config = "config", fallback = False, log_dir=None): def get_logger(file_name, module = "config", fallback = False, log_dir=None):
(conf_file,copied) = get_config(file_name, fallback = fallback) (conf_file,copied) = get_config(file_name, fallback = fallback)
if log_dir is None:
log_dir = os.path.join(get_exec_path(), 'log')
#print "\nget_logger: checking log_dir:", log_dir
check_dir(log_dir)
file = os.path.join(log_dir, 'logging.out')
if conf_file: if conf_file:
try: try:
if log_dir is None:
log_dir = os.path.join(get_exec_path(), 'log')
check_dir(log_dir)
file = os.path.join(log_dir, 'logging.out')
file = file.replace('\\', '\\\\') # replace each \ with \\ file = file.replace('\\', '\\\\') # replace each \ with \\
# print " ="+file+" "+ str(type(file))+" len="+str(len(file))+"\n" # print " ="+file+" "+ str(type(file))+" len="+str(len(file))+"\n"
logging.config.fileConfig(conf_file, {"logFile":file}) logging.config.fileConfig(conf_file, {"logFile":file})
log = logging.getLogger(config) log = logging.getLogger(module)
log.debug("%s logger initialised" % config) log.debug("%s logger initialised" % module)
return log return log
except: except:
pass pass
log = logging.basicConfig() log = logging.basicConfig(filename=file, level=logging.INFO)
log = logging.getLogger() log = logging.getLogger()
log.debug("config logger initialised") # but it looks like default is no output :-( maybe because all the calls name a module?
log.debug("Default logger initialised for "+file)
print "Default logger intialised for "+file
return log return log
def check_dir(path, create = True): def check_dir(path, create = True):