diff --git a/light9/collector/service.py b/light9/collector/service.py --- a/light9/collector/service.py +++ b/light9/collector/service.py @@ -6,17 +6,14 @@ custom code for some attributes. 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.types import Receive, Sco 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 @@ class Updates(WebSocketEndpoint, UiListe 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: