Skip to content

Commit b423650

Browse files
committed
load env variables on run time
1 parent 78a29b4 commit b423650

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

DataSpace/settings.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222

2323
from .cache_settings import *
2424

25-
env = environ.Env(DEBUG=(bool, False))
26-
DEBUG = env.bool("DEBUG", default=True)
2725
# Build paths inside the project like this: BASE_DIR / 'subdir'.
2826
BASE_DIR = Path(__file__).resolve().parent.parent
27+
28+
# Load .env file FIRST, before reading any env variables
29+
env = environ.Env(DEBUG=(bool, False))
2930
environ.Env.read_env(os.path.join(BASE_DIR, ".env"))
3031

32+
DEBUG = env.bool("DEBUG", default=True)
33+
3134
# Quick-start development settings - unsuitable for production
3235
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
3336

@@ -301,9 +304,7 @@
301304

302305
# Swagger Settings
303306
SWAGGER_SETTINGS = {
304-
"SECURITY_DEFINITIONS": {
305-
"Bearer": {"type": "apiKey", "name": "Authorization", "in": "header"}
306-
}
307+
"SECURITY_DEFINITIONS": {"Bearer": {"type": "apiKey", "name": "Authorization", "in": "header"}}
307308
}
308309

309310
# Structured Logging Configuration
@@ -370,17 +371,11 @@
370371

371372
# OpenTelemetry Sampling Configuration
372373
OTEL_TRACES_SAMPLER = "parentbased_traceidratio"
373-
OTEL_TRACES_SAMPLER_ARG = os.getenv(
374-
"OTEL_TRACES_SAMPLER_ARG", "1.0"
375-
) # Sample 100% in dev
374+
OTEL_TRACES_SAMPLER_ARG = os.getenv("OTEL_TRACES_SAMPLER_ARG", "1.0") # Sample 100% in dev
376375

377376
# OpenTelemetry Metrics Configuration
378-
OTEL_METRIC_EXPORT_INTERVAL_MILLIS = int(
379-
os.getenv("OTEL_METRIC_EXPORT_INTERVAL_MILLIS", "30000")
380-
)
381-
OTEL_METRIC_EXPORT_TIMEOUT_MILLIS = int(
382-
os.getenv("OTEL_METRIC_EXPORT_TIMEOUT_MILLIS", "30000")
383-
)
377+
OTEL_METRIC_EXPORT_INTERVAL_MILLIS = int(os.getenv("OTEL_METRIC_EXPORT_INTERVAL_MILLIS", "30000"))
378+
OTEL_METRIC_EXPORT_TIMEOUT_MILLIS = int(os.getenv("OTEL_METRIC_EXPORT_TIMEOUT_MILLIS", "30000"))
384379

385380
# OpenTelemetry Instrumentation Configuration
386381
OTEL_PYTHON_DJANGO_INSTRUMENT = True

0 commit comments

Comments
 (0)