From dea7572dbe4a45a5acbb5b00f09351c4f22f55bc Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 28 Oct 2012 18:42:57 +0100 Subject: [PATCH] wip: statistics extension layout Fixed logparser script see #333 --- .../extensions/stats/management/commands/logparser.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modoboa/extensions/stats/management/commands/logparser.py b/modoboa/extensions/stats/management/commands/logparser.py index 657f80526..758ad3910 100644 --- a/modoboa/extensions/stats/management/commands/logparser.py +++ b/modoboa/extensions/stats/management/commands/logparser.py @@ -28,7 +28,8 @@ from optparse import make_option from modoboa.lib import parameters from modoboa.admin.models import Domain from modoboa.extensions.stats import Stats -import modoboa.extensions.stats.grapher as grapher +from modoboa.extensions.stats.grapher import Grapher +from modoboa.extensions.stats.graph_templates import * rrdstep = 60 xpoints = 540 @@ -266,16 +267,16 @@ class LogParser(object): continue # Sort everything by time - G = grapher.Grapher() + G = Grapher() for dom, data in self.data.iteritems(): if self.debug: print "[rrd] dealing with domain %s" %dom for t in sorted(data.keys()): self.update_rrd(dom, t) - G.make_defaults(dom, tpl=grapher.traffic_avg_template) - G.make_defaults(dom, tpl=grapher.badtraffic_avg_template) - G.make_defaults(dom, tpl=grapher.size_avg_template) + G.make_defaults(dom, tpl=traffic_avg_template) + G.make_defaults(dom, tpl=badtraffic_avg_template) + G.make_defaults(dom, tpl=size_avg_template) class Command(BaseCommand):