Skip to content
Snippets Groups Projects
Commit b5d94abf authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '36-allow-configuring-database-options' into 'master'

Resolve "Allow configuring database options"

Closes #36

See merge request !104
parents 18be8cdc 3d61c40c
No related branches found
Tags 2.1.dev2
1 merge request!104Resolve "Allow configuring database options"
Pipeline #46422 failed
......@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Added
~~~~~
* Allow configuring database options
Changed
~~~~~~~
......
......@@ -9,5 +9,7 @@ if _settings.get("untis.database.enabled"):
"PASSWORD": _settings.get("untis.database.password", None),
"HOST": _settings.get("untis.database.host", "127.0.0.1"),
"PORT": _settings.get("untis.database.port", 3306),
"CONN_MAX_AGE": _settings.get("untis.database.conn_max_age", 0),
"OPTIONS": _settings.get("untis.database.options", {}),
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment