merged in main and resolved conflicts
This commit is contained in:
commit
d8b2323bde
|
@ -74,5 +74,9 @@ def setup_config(app: Flask) -> None:
|
||||||
app.config["SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME"],
|
app.config["SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# unversioned (see .gitignore) config that can override everything and include secrets.
|
||||||
|
# src/spiffworkflow_backend/config/secrets.py
|
||||||
|
app.config.from_pyfile(os.path.join("config", "secrets.py"), silent=True)
|
||||||
|
|
||||||
thread_local_data = threading.local()
|
thread_local_data = threading.local()
|
||||||
app.config["THREAD_LOCAL_DATA"] = thread_local_data
|
app.config["THREAD_LOCAL_DATA"] = thread_local_data
|
||||||
|
|
Loading…
Reference in New Issue