diff --git a/app/backend/model.py b/app/backend/model.py index 6ccb683..9eb38d4 100644 --- a/app/backend/model.py +++ b/app/backend/model.py @@ -5,6 +5,7 @@ from app.backend.config import ConfigReader from app.backend.db import init_db +# Cannot use api.init() here due to circular deps with Storage. cfg = ConfigReader() diff --git a/app/backend/storage.py b/app/backend/storage.py index 4a84679..090bc59 100644 --- a/app/backend/storage.py +++ b/app/backend/storage.py @@ -17,6 +17,9 @@ def __init__(self, db: Database): db.connect(reuse_if_open=True) def get_db(self) -> Database: + """ + Get the active db. + """ return self.conn def _today(self) -> datetime: diff --git a/app/bootstrap/bootstrap.py b/app/bootstrap/bootstrap.py index 8768160..b68fd90 100644 --- a/app/bootstrap/bootstrap.py +++ b/app/bootstrap/bootstrap.py @@ -9,12 +9,12 @@ def create_db(db: Database): db.close() -def create_chains(cfg, ipt): +def create_chains(ipt, cfg): ipt.setup_whitelist_chain() ipt.setup_input_chain(set_policy_drop=cfg.set_input_policy_drop) if __name__ == '__main__': storage, ipt, cfg = init() - create_db(storage.conn) - create_chains(cfg, ipt) + create_db(storage.get_db()) + create_chains(ipt, cfg)