summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Gasch <[email protected]>2022-02-04 12:13:37 -0800
committerScott Gasch <[email protected]>2022-02-04 12:13:37 -0800
commit4d03debb5b84b5b3e096add468ecd87c55ed0f5f (patch)
treef74a251a3528bbbf8ea366164c0b6cda965d67bc
parent65e6f781dffb268be6ef0a015f4cc89b57b62a5e (diff)
Have bootstrap log the site_config at program initialization.
-rw-r--r--bootstrap.py5
-rw-r--r--site_config.py25
2 files changed, 20 insertions, 10 deletions
diff --git a/bootstrap.py b/bootstrap.py
index c89952a..2df9588 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -252,6 +252,11 @@ def initialize(entry_point):
logger.debug(f'Python C API version: {sys.api_version}')
logger.debug(f'Python path: {sys.path}')
+ # Log something about the site_config, many things use it.
+ import site_config
+
+ logger.debug(f'Global site_config: {site_config.get_config()}')
+
# Allow programs that don't bother to override the random seed
# to be replayed via the commandline.
import random
diff --git a/site_config.py b/site_config.py
index 3bf049e..d98c6bc 100644
--- a/site_config.py
+++ b/site_config.py
@@ -92,16 +92,7 @@ def this_location() -> str:
return location
-def get_config(location_override: Optional[str] = None):
- """
- Get a configuration dataclass with information that is
- site-specific including the current running location.
-
- >>> cfg = get_config()
- >>> cfg.location_name == 'HOUSE' or cfg.location_name == 'CABIN'
- True
-
- """
+def effective_location(location_override: Optional[str] = None) -> str:
if location_override is None:
try:
location_override = config.config['site_config_override_location']
@@ -111,8 +102,22 @@ def get_config(location_override: Optional[str] = None):
if location_override is None or location_override == 'NONE':
location = this_location()
else:
+ logger.debug(f'site_config\'s location_override was set to: {location_override}')
location = location_override
+ return location
+
+def get_config(location_override: Optional[str] = None):
+ """
+ Get a configuration dataclass with information that is
+ site-specific including the current running location.
+
+ >>> cfg = get_config()
+ >>> cfg.location_name == 'HOUSE' or cfg.location_name == 'CABIN'
+ True
+
+ """
+ location = effective_location(location_override)
if location == 'HOUSE':
return SiteConfig(
location_name='HOUSE',