api: prepare for fosdem 2025

Author: aastefanov

api/mixerapi.conf

@@ -4,17 +4,18 @@ port = 10024
 #device = '/dev/tty_fosdem_audio_ctl'
 
 [levels]
-interval_web = 100
-interval_influx = 1000
-influx_host = '127.0.0.1:8086'
+interval_web = 50
+interval_influx = 500
+influx_host = 'control.video.fosdem.org:8086'
 influx_db = 'ebur'
 
 [state]
-interval_web = 5000
+interval_web = 1000
 interval_influx = 10000
-influx_host = '127.0.0.1:8086'
+influx_host = 'control.video.fosdem.org:8086'
 influx_db = 'ebur'
 
 [host]
 listen = '0.0.0.0'
 port = 5080
+loglevel = 'INFO'

api/mixerapi/entrypoint.py

@@ -27,7 +27,7 @@ def main():
 
     ch = logging.StreamHandler()
     ch.setFormatter(logging.Formatter('%(name)s :: %(levelname)s :: %(message)s'))
-    logging.basicConfig(level=logging.INFO, handlers=[ch])
+    logging.basicConfig(level=config['host']['loglevel'], handlers=[ch])
 
     log = logging.getLogger('CTRL')
 

api/mixerapi/levels.py

@@ -35,25 +35,42 @@ def poll_levels(config, web_state, influx_state):
     int_web = config['levels']['interval_web']
     int_influxdb = config['levels']['interval_influx']
 
-    poll_base = math.gcd(int_web, int_influxdb)
-    poll_count = math.lcm(int_web, int_influxdb)
+    gcd = math.gcd(int_web, int_influxdb)
+    lcm = math.lcm(int_web, int_influxdb)
 
-    mult_web = poll_base / int_web
-    mult_influxdb = poll_base / int_influxdb
+    # interval between polling cycles
+    poll_base = gcd
+
+    # how often will they get in sync
+    poll_count = lcm // gcd
+
+    mult_web = int_web // gcd
+    mult_influxdb = int_influxdb // gcd
+
+    logger.info(f"Polling cycles: {poll_count}, each {poll_base} ms, web every {mult_web}, influxdb every {mult_influxdb}")
 
     # like `while True`, but counts the cycle, and keeps it from overflowing
     for i in itertools.cycle(range(poll_count)):
         time.sleep(poll_base / 1000)
         levels = helpers.get_all_levels(osc)
 
         if not levels:
+            logger.error('No levels from mixer')
             continue
 
-        if i % mult_web == 0 and not web_state.is_set():
-            web_state.set(lambda x: helpers.merge(x, levels))
-
-        if i % mult_influxdb == 0 and not influx_state.is_set():
-            influx_state.set(lambda x: helpers.merge(x, levels))
+        if i % mult_web == 0:
+            logger.debug('polling web')
+            if web_state.is_set():
+                logger.debug('no web clients to update')
+            else:
+                web_state.set(lambda x: helpers.merge(x, levels))
+
+        if i % mult_influxdb == 0:
+            logger.debug('polling influxdb')
+            if influx_state.is_set():
+                logger.warn('influxdb still waiting')
+            else:
+                influx_state.set(lambda x: helpers.merge(x, levels))
 
 def push_influxdb(config, influxdb_state):
     if not ('influx_host' and 'influx_db') in config['levels']:

api/mixerapi/state.py

@@ -36,25 +36,43 @@ def poll_state(config, web_state, influx_state):
     int_web = config['state']['interval_web']
     int_influxdb = config['state']['interval_influx']
 
-    poll_base = math.gcd(int_web, int_influxdb)
-    poll_count = math.lcm(int_web, int_influxdb)
+    gcd = math.gcd(int_web, int_influxdb)
+    lcm = math.lcm(int_web, int_influxdb)
 
-    mult_web = poll_base / int_web
-    mult_influxdb = poll_base / int_influxdb
+    # interval between polling cycles
+    poll_base = gcd
+
+    # how often will they get in sync
+    poll_count = lcm // gcd
+
+    mult_web = int_web // gcd
+    mult_influxdb = int_influxdb // gcd
+
+    logger.info(f"Polling cycles: {poll_count}, each {poll_base} ms, web every {mult_web}, influxdb every {mult_influxdb}")
 
     # like `while True`, but counts the cycle, and keeps it from overflowing
     for i in itertools.cycle(range(poll_count)):
         time.sleep(poll_base / 1000)
         state = osc.get_state()
 
         if not state:
+            logger.error('No state from mixer')
             continue
 
-        if i % mult_web == 0 and not web_state.is_set():
-            web_state.set(lambda x: helpers.merge(x, state))
+        if i % mult_web == 0:
+            logger.debug('polling web')
+            if web_state.is_set():
+                logger.debug('no web clients to update')
+            else:
+                web_state.set(lambda x: helpers.merge(x, state))
+
+        if i % mult_influxdb == 0:
+            logger.debug('polling influxdb')
+            if influx_state.is_set():
+                logger.warn('influxdb still waiting')
+            else:
+                influx_state.set(lambda x: helpers.merge(x, state))
 
-        if i % mult_influxdb == 0 and not influx_state.is_set():
-            influx_state.set(lambda x: helpers.merge(x, state))
 
 def push_influxdb(config, influxdb_state):
     if not ('influx_host' and 'influx_db') in config['state']:
@@ -75,7 +93,7 @@ def push_influxdb(config, influxdb_state):
                 [f'input_multipliers,box={hostname},ch={ch} multiplier={mult}'
                  for ch, mult in state['multipliers']['input'].items()] +
                 [f'output_multipliers,box={hostname},bus={bus} multiplier={mult}'
-                 for bus, mult in state['multipliers']['input'].items()] +
+                 for bus, mult in state['multipliers']['output'].items()] +
                 [f'mutes,box={hostname},ch={ch},bus={bus} muted={muted}'
                  for ch, kvp in state['mutes'].items() for bus, muted in kvp.items()]
                 )