From cad3051e7f265ed9329535b03e6a913ce5981bcb Mon Sep 17 00:00:00 2001 From: Pablo Revilla Date: Thu, 18 Sep 2025 07:38:58 -0700 Subject: [PATCH] Work on db cleanup tool --- meshview/database.py | 2 +- meshview/mqtt_database.py | 2 +- meshview/web.py | 2 +- sample.config.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meshview/database.py b/meshview/database.py index 570297e..170e204 100644 --- a/meshview/database.py +++ b/meshview/database.py @@ -17,7 +17,7 @@ def init_database(database_connection_string, read_only=False): database_connection_string += "?mode=ro" kwargs["connect_args"] = {"uri": True} else: - kwargs["connect_args"] = {"timeout": 60} + kwargs["connect_args"] = {"timeout": 300} else: kwargs["pool_size"] = 20 kwargs["max_overflow"] = 50 diff --git a/meshview/mqtt_database.py b/meshview/mqtt_database.py index e4296d0..7726ba2 100644 --- a/meshview/mqtt_database.py +++ b/meshview/mqtt_database.py @@ -7,7 +7,7 @@ def init_database(database_connection_string): if not database_connection_string.startswith('sqlite'): kwargs['pool_size'] = 20 kwargs['max_overflow'] = 50 - engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 60}) + engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 300}) async_session = async_sessionmaker(engine, expire_on_commit=False) async def create_tables(): diff --git a/meshview/web.py b/meshview/web.py index 079759e..a2b9926 100644 --- a/meshview/web.py +++ b/meshview/web.py @@ -1585,7 +1585,7 @@ async def api_config(request): site = CONFIG.get("site", {}) safe_site = { "map_interval": site.get("map_interval", 3), # default 3 if missing - "firehose_interval": site.get("firehose_interval", 3) # default 1000 if missing + "firehose_interval": site.get("firehose_interval", 3) # default 3 if missing } safe_config = {"site": safe_site} diff --git a/sample.config.ini b/sample.config.ini index c86508d..c7bb878 100644 --- a/sample.config.ini +++ b/sample.config.ini @@ -101,4 +101,4 @@ minute = 00 # Number of rows to delete per batch batch_size = 100 # Run VACUUM after cleanup -vacuum = True \ No newline at end of file +vacuum = False \ No newline at end of file