diff --git a/bin/paintserver b/bin/paintserver --- a/bin/paintserver +++ b/bin/paintserver @@ -3,10 +3,8 @@ from run_local import log import json from twisted.internet import reactor -from greplin.scales.cyclonehandler import StatsHandler from rdfdb.syncedgraph import SyncedGraph from light9 import networking, showconfig -from greplin import scales import optparse, sys, logging import cyclone.web from rdflib import URIRef @@ -14,6 +12,7 @@ from light9 import clientsession import light9.paint.solve from cycloneerr import PrettyErrorHandler from light9.namespaces import L9, DEV +from light9.metrics import metrics import imp @@ -21,7 +20,7 @@ class Solve(PrettyErrorHandler, cyclone. def post(self): painting = json.loads(self.request.body) - with self.settings.stats.solve.time(): + with metrics('solve').time(): img = self.settings.solver.draw(painting) sample, sampleDist = self.settings.solver.bestMatch( img, device=DEV['aura2']) @@ -53,7 +52,7 @@ class BestMatches(PrettyErrorHandler, cy body = json.loads(self.request.body) painting = body['painting'] devs = [URIRef(d) for d in body['devices']] - with self.settings.stats.solve.time(): + with metrics('solve').time(): img = self.settings.solver.draw(painting) outSettings = self.settings.solver.bestMatches(img, devs) self.write(json.dumps({'settings': outSettings.asList()})) @@ -69,10 +68,6 @@ class App(object): self.graph.initiallySynced.addCallback(self.launch).addErrback( log.error) - self.stats = scales.collection( - '/', - scales.PmfStat('solve', recalcPeriod=1), - ) def launch(self, *args): @@ -91,16 +86,13 @@ class App(object): self.solver.loadSamples() self.cycloneApp = cyclone.web.Application(handlers=[ - (r'/stats/(.*)', StatsHandler, { - 'serverName': 'paintserver' - }), (r'/solve', Solve), (r'/bestMatches', BestMatches), + metricsRoute(), ], debug=True, graph=self.graph, - solver=self.solver, - stats=self.stats) + solver=self.solver) reactor.listenTCP(networking.paintServer.port, self.cycloneApp) log.info("listening on %s" % networking.paintServer.port)