Module: deluge Branch: master Commit: bad228645cfe97cb9d8b8dea372e84505f80e2b8
Author: Pedro Algarvio <[email protected]> Date: Wed Jul 6 20:56:08 2011 +0100 The Stats plugin should not be using the old logging system. --- deluge/plugins/Stats/deluge/plugins/stats/core.py | 14 ++++++++------ deluge/plugins/Stats/deluge/plugins/stats/graph.py | 14 ++++++++------ deluge/plugins/Stats/deluge/plugins/stats/gtkui.py | 4 +++- deluge/plugins/Stats/deluge/plugins/stats/webui.py | 8 +++++--- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/deluge/plugins/Stats/deluge/plugins/stats/core.py b/deluge/plugins/Stats/deluge/plugins/stats/core.py index d1e9776..6f95483 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/core.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/core.py @@ -33,11 +33,11 @@ # but you are not obligated to do so. If you do not wish to do so, delete # this exception statement from your version. If you delete this exception -from twisted.internet.task import LoopingCall import time +import logging +from twisted.internet.task import LoopingCall import deluge -from deluge.log import LOG as log from deluge.plugins.pluginbase import CorePluginBase from deluge import component from deluge import configmanager @@ -57,6 +57,8 @@ DEFAULT_TOTALS = { "stats": {} } +log = logging.getLogger(__name__) + def get_key(config, key): try: return config[key] @@ -78,14 +80,14 @@ class Core(CorePluginBase): self.stats ={} self.count = {} self.intervals = [1, 5, 30, 300] - + self.last_update = {} t = time.time() for i in self.intervals: self.stats[i] = {} self.last_update[i] = t self.count[i] = 0 - + self.config = configmanager.ConfigManager("stats.conf", DEFAULT_PREFS) self.saved_stats = configmanager.ConfigManager("stats.totals", DEFAULT_TOTALS) @@ -162,7 +164,7 @@ class Core(CorePluginBase): stat_list.insert(0, 0) if len(stat_list) > self.length: stat_list.pop() - + def update_interval(interval, base, multiplier): self.count[interval] = self.count[interval] + 1 if self.count[interval] >= interval: @@ -206,7 +208,7 @@ class Core(CorePluginBase): for key in keys: if key in self.stats[interval]: stats_dict[key] = self.stats[interval][key] - + stats_dict["_last_update"] = self.last_update[interval] stats_dict["_length"] = self.config["length"] stats_dict["_update_interval"] = interval diff --git a/deluge/plugins/Stats/deluge/plugins/stats/graph.py b/deluge/plugins/Stats/deluge/plugins/stats/graph.py index b5a2655..7d82a32 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/graph.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/graph.py @@ -40,9 +40,11 @@ port of old plugin by markybob. import time import math import cairo -from deluge.log import LOG as log +import logging from deluge.ui.client import client +log = logging.getLogger(__name__) + black = (0, 0, 0) gray = (0.75, 0.75, 0.75) white = (1.0, 1.0, 1.0) @@ -137,7 +139,7 @@ class Graph: duration = self.length * self.interval start = self.last_update - duration ratio = (right - left) / float(duration) - + if duration < 1800 * 10: #try rounding to nearest 1min, 5mins, 10mins, 30mins for step in [60, 300, 600, 1800]: @@ -194,7 +196,7 @@ class Graph: self.draw_x_axis(bounds) self.draw_left_axis(bounds, y_ticks, y_tick_text) - + def intervalise(self, x, limit=None): """Given a value x create an array of tick points to got with the graph The number of ticks returned can be constrained by limit, minimum of 3 @@ -215,9 +217,9 @@ class Graph: log = math.log10(x) intbit = math.floor(log) - interval = math.pow(10, intbit) + interval = math.pow(10, intbit) steps = int(math.ceil(x / interval)) - + if steps <= 1 and (limit is None or limit >= 10*steps): interval = interval * 0.1 steps = steps * 10 @@ -234,7 +236,7 @@ class Graph: interval = interval * 5 else: interval = interval * 2 - + intervals = [i * interval * scale for i in xrange(1+int(math.ceil(x/ interval)))] return intervals diff --git a/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py b/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py index 607fc40..4af3e4c 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py @@ -37,12 +37,12 @@ import gtk import gobject +import logging from gtk.glade import XML import graph import deluge from deluge import component -from deluge.log import LOG as log from deluge.common import fspeed from deluge.ui.client import client from deluge.ui.gtkui.torrentdetails import Tab @@ -50,6 +50,8 @@ from deluge.plugins.pluginbase import GtkPluginBase import common +log = logging.getLogger(__name__) + DEFAULT_CONF = { 'version': 1, 'colors' :{ 'bandwidth_graph': {'upload_rate': str(gtk.gdk.Color("blue")), diff --git a/deluge/plugins/Stats/deluge/plugins/stats/webui.py b/deluge/plugins/Stats/deluge/plugins/stats/webui.py index 6ec2616..ebdbeae 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/webui.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/webui.py @@ -37,17 +37,19 @@ # # -from deluge.log import LOG as log +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource +log = logging.getLogger(__name__) + class WebUI(WebPluginBase): - + scripts = [get_resource("stats.js")] - + # The enable and disable methods are not scrictly required on the WebUI # plugins. They are only here if you need to register images/stylesheets # with the webserver. -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
