aboutsummaryrefslogtreecommitdiff
path: root/salis.py
diff options
context:
space:
mode:
Diffstat (limited to 'salis.py')
-rwxr-xr-xsalis.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/salis.py b/salis.py
index b75a174..d0f6e25 100755
--- a/salis.py
+++ b/salis.py
@@ -330,12 +330,16 @@ def pop_ui_vars():
ns.b.defines.update({*ns.ui_vars["defines"]})
ns.b.links.update({*ns.ui_vars["links"]})
+def pop_db_vars():
+ ns.sim_db = os.path.join(ns.sim_dir, f"{args.name}.sqlite3")
+ ns.b.defines.add(f"-DDATA_PUSH_BUSY_TIMEOUT=600000")
+ ns.b.defines.add(f"-DDATA_PUSH_PATH=\"{ns.sim_db}\"")
+ ns.b.links.add("-lsqlite3")
+ ns.b.links.add("-lz")
+
def pop_data_push_vars():
if args.data_push_pow:
- ns.sim_db = os.path.join(ns.sim_dir, f"{args.name}.sqlite3")
- ns.b.defines.add(f"-DDATA_PUSH_PATH=\"{ns.sim_db}\"")
- ns.b.links.add("-lsqlite3")
- ns.b.links.add("-lz")
+ pop_db_vars()
log.info(f"Data will be aggregated at: {ns.sim_db}")
else:
log.warn("Data aggregation disabled")
@@ -419,6 +423,7 @@ if args.command == "load":
# Populate for server
if args.command == "server":
ns.b = Build("data/server.c", log)
+ pop_db_vars()
pop_sim_path_vars()
pop_net_vars()
pop_general()