diff --git a/pyleds/lib/Config.py b/pyleds/lib/Config.py index 544ba6f..85ed098 100644 --- a/pyleds/lib/Config.py +++ b/pyleds/lib/Config.py @@ -1,4 +1,5 @@ from dotenv import dotenv_values +import pathlib def populate_values(load: {}): @@ -26,9 +27,10 @@ class Config(object): _config: {} = {} def __init__(self): + rp = str(pathlib.Path(__file__).parent.parent.absolute()) load_conf = { - **dotenv_values(".env.defaults"), - **dotenv_values(".env"), + **dotenv_values(rp + "/.env.defaults"), + **dotenv_values(rp + "/.env"), } self._config = populate_values(load_conf) diff --git a/pyleds/run.py b/pyleds/run.py index 5a64a87..451d529 100755 --- a/pyleds/run.py +++ b/pyleds/run.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 import logging +import pathlib import sys - import lib.ProgramLoading as Pl from lib.Litsimaja import Litsimaja from flask import Flask, request, Response, render_template, json +root_path = pathlib.Path(__file__).parent.absolute() # start litsimaja lm = Litsimaja() @@ -13,7 +14,7 @@ lm = Litsimaja() logger = logging.getLogger('litsimaja') logger.setLevel(logging.DEBUG if lm.conf('IS_DEV') else logging.WARN) 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) logger.addHandler(file_handler) stdout_handler = logging.StreamHandler(sys.stdout)