Skip to content

Commit 00b963c

Browse files
author
codewithcj001
committed
fix on env variable logging
1 parent a7cc838 commit 00b963c

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

SparkyBudget/SparkyBudget.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,28 @@
77
import dotenv
88
import os
99

10-
# Load from private/.env first (lowest precedence)
11-
dotenv_path_private = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private', '.env')
12-
dotenv.load_dotenv(dotenv_path_private, override=True)
13-
14-
# Then load from the default location (main folder)
15-
dotenv.load_dotenv(override=True)
16-
17-
DATABASE_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private', 'db', 'SparkyBudget.db') # Revert to original calculation
18-
PRIVATE_FOLDER_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private') # Define private folder path
19-
20-
# Get log level from environment, default to INFO if not set
21-
log_level = os.getenv("LOG_LEVEL", "INFO").upper()
10+
# Configure logging early to see initial env vars
2211
logging.basicConfig(
23-
level=log_level,
12+
level=os.getenv("LOG_LEVEL", "INFO").upper(),
2413
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
2514
handlers=[
2615
logging.StreamHandler() # Logs to the console
2716
]
2817
)
2918
logger = logging.getLogger(__name__)
3019

20+
21+
# Load from private/.env first (lowest precedence)
22+
dotenv_path_private = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private', '.env')
23+
# Load from private/.env first (lowest precedence), but do not override existing env vars
24+
dotenv.load_dotenv(dotenv_path_private)
25+
26+
# Then load from the default location (main folder), but do not override existing env vars
27+
dotenv.load_dotenv()
28+
29+
DATABASE_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private', 'db', 'SparkyBudget.db') # Revert to original calculation
30+
PRIVATE_FOLDER_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'private') # Define private folder path
31+
3132
# py_utils
3233
from py_utils.auth import load_user, login, logout, before_request, unauthorized
3334
from py_utils.currency_utils import app as currency_app
@@ -47,6 +48,7 @@
4748

4849

4950
def create_app():
51+
logger.debug(f"FLASK_SECRET_KEY at app creation: {os.getenv('FLASK_SECRET_KEY')}")
5052
app = Flask(__name__, template_folder='./templates', static_folder='./static')
5153
app.jinja_env.add_extension("jinja2.ext.loopcontrols")
5254
app.config['DATABASE_PATH'] = DATABASE_PATH

0 commit comments

Comments
 (0)