diff --git a/bin/captureDevice b/bin/captureDevice --- a/bin/captureDevice +++ b/bin/captureDevice @@ -10,8 +10,7 @@ import os import time import treq import cyclone.web, cyclone.websocket, cyclone.httpclient -from greplin import scales - +from light9.metrics import metrics, metricsRoute from run_local import log from cycloneerr import PrettyErrorHandler @@ -19,14 +18,11 @@ from light9.namespaces import L9, RDF from light9 import networking, showconfig from rdfdb.syncedgraph import SyncedGraph from light9.paint.capture import writeCaptureDescription -from greplin.scales.cyclonehandler import StatsHandler from light9.effect.settings import DeviceSettings from light9.collector.collector_client import sendToCollector from rdfdb.patch import Patch from light9.zmqtransport import parseJsonMessage -stats = scales.collection('/webServer', scales.PmfStat('setAttr', - recalcPeriod=1)) class Camera(object): @@ -158,11 +154,11 @@ camera = Camera( class Attrs(PrettyErrorHandler, cyclone.web.RequestHandler): + @metrics('set_attr').time() def put(self): - with stats.setAttr.time(): - client, clientSession, settings, sendTime = parseJsonMessage( - self.request.body) - self.set_status(202) + client, clientSession, settings, sendTime = parseJsonMessage( + self.request.body) + self.set_status(202) def launch(graph): @@ -174,9 +170,7 @@ def launch(graph): "path": "light9/web", "default_filename": "captureDevice.html" }), - (r'/stats/(.*)', StatsHandler, { - 'serverName': 'captureDevice' - }), + metricsRoute(), ]), interface='::', cap=cap)