changeset 2080:6eb1fcbad5f6

log/metrics cleanup
author drewp@bigasterisk.com
date Tue, 24 May 2022 23:32:19 -0700
parents 5ea209b111fe
children c57cf4049004
files light9/collector/service.py
diffstat 1 files changed, 7 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/light9/collector/service.py	Tue May 24 23:26:39 2022 -0700
+++ b/light9/collector/service.py	Tue May 24 23:32:19 2022 -0700
@@ -6,17 +6,14 @@
 
 Input can be over http or zmq.
 """
-import asyncio
 import functools
-import logging
-import os
 import traceback
 from typing import List
 
 from light9 import networking
 from light9.collector.collector import Collector
 from light9.collector.output import ArtnetDmx, DummyOutput, Output  # noqa
-from light9.collector.weblisteners import WebListeners, UiListener
+from light9.collector.weblisteners import UiListener, WebListeners
 from light9.namespaces import L9
 from light9.run_local import log
 from light9.zmqtransport import parseJsonMessage
@@ -30,6 +27,8 @@
 from starlette.websockets import WebSocket
 from starlette_exporter import PrometheusMiddleware, handle_metrics
 
+STAT_SETATTR = Summary('set_attr', 'setAttr calls')
+
 
 class Updates(WebSocketEndpoint, UiListener):
 
@@ -55,25 +54,14 @@
     pass
 
 
-STAT_SETATTR = Summary('set_attr', 'setAttr calls')
-
-
 async def PutAttrs(collector: Collector, request):
-    client, clientSession, settings, sendTime = parseJsonMessage(await request.body())
-    collector.setAttrs(client, clientSession, settings, sendTime)
-    return Response('', status_code=202)
+    with STAT_SETATTR.time():
+        client, clientSession, settings, sendTime = parseJsonMessage(await request.body())
+        collector.setAttrs(client, clientSession, settings, sendTime)
+        return Response('', status_code=202)
 
 
 def main():
-    # verbose = os.environ.get('VERBOSE', False)
-    # logdmx = os.environ.get('LOGDMX', False)  # log all dmx sends
-
-    log.setLevel(logging.DEBUG)
-    # logging.getLogger('output').setLevel(logging.DEBUG)
-
-    # logging.getLogger('output.allDmx').setLevel(logging.DEBUG if logdmx else logging.INFO)
-    # logging.getLogger('colormath').setLevel(logging.INFO)
-
     graph = SyncedGraph(networking.rdfdb.url, "collector")
 
     try: