wiring up server logging controls

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.7.37 (build 22077, api 9, 2024-11-07)
+### 1.7.37 (build 22080, api 9, 2024-11-07)
 - Bumping api version to 9. As you'll see below, there's some UI changes that
   will require a bit of work for any UI mods to adapt to. If your mods don't
   touch UI stuff at all you can simply bump your api version and call it a day.

src/assets/ba_data/python/baenv.py

@@ -53,7 +53,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 22077
+TARGET_BALLISTICA_BUILD = 22080
 TARGET_BALLISTICA_VERSION = '1.7.37'
 
 
@@ -316,7 +316,7 @@ def _setup_logging(launch_time: float) -> LogHandler:
 
     log_handler = setup_logging(
         log_path=None,
-        level=LogLevel.DEBUG,
+        level=LogLevel.INFO,
         log_stdout_stderr=True,
         cache_size_limit=1024 * 1024,
         launch_time=launch_time,
@@ -336,6 +336,8 @@ def _set_log_levels(app_config: dict) -> None:
             get_base_logger_control_config_client().apply()
             return
 
+        print('WTF', config)
+
         # Make sure data is expected types/values.
         valid_levels = {
             logging.NOTSET,

src/assets/server_package/ballisticakit_server.py

@@ -11,6 +11,7 @@
 import json
 import signal
 import tomllib
+import logging
 import subprocess
 from pathlib import Path
 from threading import Lock, Thread, current_thread
@@ -801,23 +802,46 @@ def _prep_subprocess_environment(self) -> None:
 
         # Some of our config values translate directly into the
         # ballisticakit config file; the rest we pass at runtime.
+
+        # IMPORTANT: Make sure we *ALWAYS* push values (or lack thereof)
+        # through; otherwise stale values from previous runs can linger
+        # in the bincfg.
+
         bincfg['Port'] = self._config.port
         bincfg['Auto Balance Teams'] = self._config.auto_balance_teams
         bincfg['Show Tutorial'] = self._config.show_tutorial
 
+        binkey = 'SceneV1 Host Protocol'
         if self._config.protocol_version is not None:
-            bincfg['SceneV1 Host Protocol'] = self._config.protocol_version
+            bincfg[binkey] = self._config.protocol_version
+        elif binkey in bincfg:
+            del bincfg[binkey]
+
+        binkey = 'Custom Team Names'
         if self._config.team_names is not None:
-            bincfg['Custom Team Names'] = self._config.team_names
-        elif 'Custom Team Names' in bincfg:
-            del bincfg['Custom Team Names']
+            bincfg[binkey] = self._config.team_names
+        elif binkey in bincfg:
+            del bincfg[binkey]
 
+        binkey = 'Custom Team Colors'
         if self._config.team_colors is not None:
-            bincfg['Custom Team Colors'] = self._config.team_colors
-        elif 'Custom Team Colors' in bincfg:
-            del bincfg['Custom Team Colors']
+            bincfg[binkey] = self._config.team_colors
+        elif binkey in bincfg:
+            del bincfg[binkey]
 
         bincfg['Idle Exit Minutes'] = self._config.idle_exit_minutes
+
+        binkey = 'Log Levels'
+        if self._config.log_levels is not None:
+            # Users supply us log level names like NOTSET; convert those
+            # to numeric vals which the engine expects.
+            bincfg[binkey] = {
+                key: logging.getLevelName(val)
+                for key, val in self._config.log_levels.items()
+            }
+        elif binkey in bincfg:
+            del bincfg[binkey]
+
         with open(cfgpath, 'w', encoding='utf-8') as outfile:
             outfile.write(json.dumps(bincfg))
 

src/ballistica/shared/ballistica.cc

@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 22077;
+const int kEngineBuildNumber = 22080;
 const char* kEngineVersion = "1.7.37";
 const int kEngineApiVersion = 9;
 

tools/batools/build.py

@@ -476,7 +476,7 @@ def _get_server_config_template_toml(projroot: str) -> str:
     cfg.team_colors = ((0.1, 0.25, 1.0), (1.0, 0.25, 0.2))
     cfg.public_ipv4_address = '123.123.123.123'
     cfg.public_ipv6_address = '123A::A123:23A1:A312:12A3:A213:2A13'
-    cfg.log_levels = {'ba.lifecycle': 'DEBUG', 'ba.assets': 'DEBUG'}
+    cfg.log_levels = {'ba.lifecycle': 'DEBUG', 'ba.assets': 'INFO'}
 
     lines_in = _get_server_config_raw_contents(projroot).splitlines()