pvx/litsimaja
1
0
Fork 3
Code Issues Pull Requests 2 Releases Wiki Activity

Set paths absolute

Browse Source
This commit is contained in:
siinus
2021-05-03 19:05:27 +03:00
parent 103e04a1b4
commit 33109455c9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyleds/lib/Config.py
View File

@@ -1,4 +1,5 @@
from dotenv import dotenv_values from dotenv import dotenv_values
import pathlib
def populate_values(load: {}): def populate_values(load: {}):
@@ -26,9 +27,10 @@ class Config(object):
_config: {} = {} _config: {} = {}
def __init__(self): def __init__(self):
rp = str(pathlib.Path(__file__).parent.parent.absolute())
load_conf = { load_conf = {
**dotenv_values(".env.defaults"), **dotenv_values(rp + "/.env.defaults"),
**dotenv_values(".env"), **dotenv_values(rp + "/.env"),
} }
self._config = populate_values(load_conf) self._config = populate_values(load_conf)

5
pyleds/run.py
View File

@@ -1,11 +1,12 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging import logging
import pathlib
import sys import sys
import lib.ProgramLoading as Pl import lib.ProgramLoading as Pl
from lib.Litsimaja import Litsimaja from lib.Litsimaja import Litsimaja
from flask import Flask, request, Response, render_template, json from flask import Flask, request, Response, render_template, json
root_path = pathlib.Path(__file__).parent.absolute()
# start litsimaja # start litsimaja
lm = Litsimaja() lm = Litsimaja()
@@ -13,7 +14,7 @@ lm = Litsimaja()
logger = logging.getLogger('litsimaja') logger = logging.getLogger('litsimaja')
logger.setLevel(logging.DEBUG if lm.conf('IS_DEV') else logging.WARN) logger.setLevel(logging.DEBUG if lm.conf('IS_DEV') else logging.WARN)
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
file_handler = logging.FileHandler('litsimaja.log') file_handler = logging.FileHandler(str(root_path) + '/litsimaja.log')
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
logger.addHandler(file_handler) logger.addHandler(file_handler)
stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler = logging.StreamHandler(sys.stdout)