diff --git a/bin/effecteval b/bin/effecteval --- a/bin/effecteval +++ b/bin/effecteval @@ -11,17 +11,14 @@ from light9 import networking, showconfi from light9.effecteval.effect import EffectNode from light9.effect.edit import getMusicStatus, songNotePatch from light9.effecteval.effectloop import makeEffectLoop -from greplin.scales.cyclonehandler import StatsHandler +from light9.metrics import metrics, metricsRoute from light9.namespaces import L9 from rdfdb.patch import Patch from rdfdb.syncedgraph import SyncedGraph -from greplin import scales -from standardservice.scalessetup import gatherProcessStats from cycloneerr import PrettyErrorHandler from light9.coffee import StaticCoffee -gatherProcessStats() class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler): @@ -226,19 +223,10 @@ class App(object): self.graph.initiallySynced.addCallback(self.launch).addErrback( log.error) - self.stats = scales.collection( - '/', - scales.PmfStat('sendLevels', recalcPeriod=1), - scales.PmfStat('getMusic', recalcPeriod=1), - scales.PmfStat('evals', recalcPeriod=1), - scales.PmfStat('sendOutput', recalcPeriod=1), - scales.IntStat('errors'), - ) - def launch(self, *args): log.info('launch') if self.outputWhere: - self.loop = makeEffectLoop(self.graph, self.stats, self.outputWhere) + self.loop = makeEffectLoop(self.graph, self.outputWhere) self.loop.startLoop() SFH = cyclone.web.StaticFileHandler @@ -260,13 +248,10 @@ class App(object): (r'/effect/eval', EffectEval), (r'/songEffects', SongEffects), (r'/songEffects/eval', SongEffectsEval), - (r'/stats/(.*)', StatsHandler, { - 'serverName': 'effecteval' - }), + metricsRoute(), ], debug=True, - graph=self.graph, - stats=self.stats) + graph=self.graph) reactor.listenTCP(networking.effectEval.port, self.cycloneApp) log.info("listening on %s" % networking.effectEval.port)