- tor-commits - lists.torproject.org

[arm/master] fix: last tor runtime showed if never connected
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit c2b4bd61b78b2b5fcda639c0f791f998223955ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:13:22 2011 -0700 fix: last tor runtime showed if never connected The header panel shows when arm was last detached from Tor. However, if we have never connected to a Tor control port then this is nonesense, showing the epoch time ("16:00 12/31/1969") instead. Dropping the field in this case. --- src/cli/headerPanel.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 846c1db..5a2c1bc 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -204,10 +204,14 @@ class HeaderPanel(panel.Panel, threading.Thread): x += 17 else: statusTime = torTools.getConn().getStatus()[1] - statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" # never connected to tor + self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) - self.addstr(1, x + 16, " (%s, press r to reconnect)" % statusTimeLabel) - x += 41 + len(statusTimeLabel) + self.addstr(1, x + 16, " (%spress r to reconnect)" % statusTimeLabel) + x += 39 + len(statusTimeLabel) includeControlPort = False if includeControlPort:

1 0

[arm/master] Implement bandwidth stats in graph labels.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 40174345257913b871b87e8e513b911b0ec07205 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:36:03 2011 +0500 Implement bandwidth stats in graph labels. --- src/gui/arm.xml | 10 ++++---- src/gui/controller.py | 4 ++- src/gui/graphing/bandwidthStats.py | 37 ++++++++++++++++++++++++---- src/gui/graphing/graphStats.py | 47 +++++++++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 23230b6..e62c622 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <child> <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 40 Mb/s, Burst: 80 Mb/s</property> + <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Download (0.0 b/sec)</property> + <property name="label" translatable="yes">Download: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -344,7 +344,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload (0.0 b/sec)</property> + <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gui/controller.py b/src/gui/controller.py index 91b9a03..7f85b9a 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -26,10 +26,12 @@ class GuiController: self._pack_graph_widget('primary') self._pack_graph_widget('secondary') - self.bwStats = bandwidthStats.BandwidthStats(self.widgets) + self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 304574e..a8278d8 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -9,18 +9,45 @@ import gtk from TorCtl import TorCtl from gui.graphing import graphStats -from util import torTools +from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, widgets): - graphStats.GraphStats.__init__(self, widgets) + def __init__(self, builder, widgets): + graphStats.GraphStats.__init__(self, builder, widgets) conn = torTools.getConn() if not conn.isAlive(): conn.init() - conn.setControllerEvents(["BW"]) + + conn.setControllerEvents(["BW", "NEWDESC"]) conn.addEventListener(self) + self.new_desc_event(None) + + def new_desc_event(self, event): + conn = torTools.getConn() + + if not conn.isAlive(): + return + + bwRate = conn.getMyBandwidthRate() + bwBurst = conn.getMyBandwidthBurst() + bwObserved = conn.getMyBandwidthObserved() + bwMeasured = conn.getMyBandwidthMeasured() + + if bwRate and bwBurst: + bwRateLabel = uiTools.getSizeLabel(bwRate, 1, False, isBytes=False) + bwBurstLabel = uiTools.getSizeLabel(bwBurst, 1, False, isBytes=False) + + msg = "Limit: %s/s, Burst: %s/s" % (bwRateLabel, bwBurstLabel) + label = self.builder.get_object('label_graph_top') + label.set_text(msg) + def bandwidth_event(self, event): - self._processEvent(event.read / 1024.0, event.written / 1024.0) + self._processEvent(event.read, event.written) + + msg = 'Download: %s/s' % uiTools.getSizeLabel(event.read, 2, isBytes=False) + self.update_header('primary', msg) + msg = 'Upload: %s/s' % uiTools.getSizeLabel(event.written, 2, isBytes=False) + self.update_header('secondary', msg) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 5037c39..c000ff4 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -11,19 +11,23 @@ import gobject import gtk from TorCtl import TorCtl -from util import torTools +from util import uiTools, torTools GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, widgets): + def __init__(self, builder, widgets): TorCtl.PostEventListener.__init__(self) + self.builder = builder self.widgets = widgets self.data = { - 'primary' : deque([0] * GRAPH_INTERVAL), - 'secondary' : deque([0] * GRAPH_INTERVAL)} + 'primary' : deque([0.0] * GRAPH_INTERVAL), + 'secondary' : deque([0.0] * GRAPH_INTERVAL)} + + self.total = {'primary': 0.0, 'secondary' : 0.0} + self.ticks = {'primary': 0, 'secondary' : 0} def get_graph_data(self, name): packed_data = [] @@ -51,11 +55,38 @@ class GraphStats(TorCtl.PostEventListener): graph.auto_set_yrange(index) graph.queue_draw() + return True + def update_labels(self, name): + avg = 0 + + try: + avg = self.total[name] / float(self.ticks[name]) + except ZeroDivisionError: + pass + + msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), + uiTools.getSizeLabel(self.total[name], 2)) + label = self.builder.get_object('label_graph_%s_bottom' % name) + label.set_text(msg) + + return True + + def update_header(self, name, msg): + label = self.builder.get_object('label_graph_%s_top' % name) + label.set_text(msg) + def _processEvent(self, primary, secondary): - self.data['primary'].rotate(1) - self.data['primary'][0] = primary - self.data['secondary'].rotate(1) - self.data['secondary'][0] = secondary + values = {'primary' : primary, 'secondary' : secondary} + + for name in ('primary', 'secondary'): + # right shift and store kbytes in left-most location + self.data[name].rotate(1) + self.data[name][0] = values[name] / 1024 + + self.total[name] = self.total[name] + values[name] + + if values[name] > 0: + self.ticks[name] = self.ticks[name] + 1

1 0

[arm/master] Fixed default labels.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit bebfedd1300392223436d49e018910f56b219b37 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:41:39 2011 +0500 Fixed default labels. --- src/gui/arm.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index e62c622..11f5c63 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <child> <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> + <property name="label" translatable="yes">Limit: 0.00 b/s, Burst: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Download: 0.00 Kb/s</property> + <property name="label" translatable="yes">Download: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> + <property name="label" translatable="yes">Upload: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property>

1 0

[arm/master] Moved cagraph packing from controller to graphing.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit afeb960aa3d3e7f2d80e648fd837c53298ce55ae Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 19 12:44:37 2011 +0500 Moved cagraph packing from controller to graphing. --- src/gui/controller.py | 49 ++-------------------------------- src/gui/graphing/bandwidthStats.py | 4 +- src/gui/graphing/graphStats.py | 51 +++++++++++++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 7f85b9a..4da82c9 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -2,13 +2,7 @@ import gobject import gtk from util import torTools -from gui.graphing import graphStats, bandwidthStats - -from cagraph.ca_graph import CaGraph -from cagraph.axis.xaxis import CaGraphXAxis -from cagraph.axis.yaxis import CaGraphYAxis -from cagraph.ca_graph_grid import CaGraphGrid -from cagraph.series.area import CaGraphSeriesArea +from gui.graphing import bandwidthStats gobject.threads_init() @@ -20,18 +14,8 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - # for custom widgets not present in builder xml - self.widgets = {} - - self._pack_graph_widget('primary') - self._pack_graph_widget('secondary') - - self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) - - gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') - gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') + self.bwStats = bandwidthStats.BandwidthStats(self.builder) + self.bwStats.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -47,33 +31,6 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() - def _pack_graph_widget(self, name): - graph = CaGraph() - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = graphStats.GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} - fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} - series.style.line_color = line_colors[name] - series.style.fill_color = fill_colors[name] - - graph.seriess.append(series) - graph.grid = CaGraphGrid(graph, 0, 1) - - self.widgets['graph_%s' % name] = graph - def startGui(): controller = GuiController() controller.run() diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index a8278d8..401302c 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -12,8 +12,8 @@ from gui.graphing import graphStats from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, builder, widgets): - graphStats.GraphStats.__init__(self, builder, widgets) + def __init__(self, builder): + graphStats.GraphStats.__init__(self, builder) conn = torTools.getConn() if not conn.isAlive(): diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index c000ff4..fcd326f 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -13,15 +13,21 @@ import gtk from TorCtl import TorCtl from util import uiTools, torTools +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, builder, widgets): + def __init__(self, builder): TorCtl.PostEventListener.__init__(self) self.builder = builder - self.widgets = widgets + self.graphs = { 'primary' : None, 'secondary' : None } self.data = { 'primary' : deque([0.0] * GRAPH_INTERVAL), 'secondary' : deque([0.0] * GRAPH_INTERVAL)} @@ -29,6 +35,45 @@ class GraphStats(TorCtl.PostEventListener): self.total = {'primary': 0.0, 'secondary' : 0.0} self.ticks = {'primary': 0, 'secondary' : 0} + def pack_widgets(self): + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + gobject.timeout_add(1000, self.draw_graph, 'primary') + gobject.timeout_add(1000, self.draw_graph, 'secondary') + gobject.timeout_add(1000, self.update_labels, 'primary') + gobject.timeout_add(1000, self.update_labels, 'secondary') + + def _pack_graph_widget(self, name): + graph = CaGraph() + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + yaxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} + fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} + series.style.line_color = line_colors[name] + series.style.fill_color = fill_colors[name] + + graph.seriess.append(series) + graph.grid = CaGraphGrid(graph, 0, 1) + + self.graphs[name] = graph + + return graph + def get_graph_data(self, name): packed_data = [] @@ -42,7 +87,7 @@ class GraphStats(TorCtl.PostEventListener): return len(data) == map(int, data).count(0) def draw_graph(self, name): - graph = self.widgets['graph_%s' % name] + graph = self.graphs[name] data = self.get_graph_data(name) if self.is_graph_data_zero(name):

1 0

[arm/master] Support logging of arm events.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit d5556ad4ce0c43d0aca1b287ad59c3a90bd923c5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jun 20 16:55:05 2011 +0500 Support logging of arm events. --- src/gui/__init__.py | 2 +- src/gui/arm.xml | 8 +------ src/gui/controller.py | 14 +++++++----- src/gui/logPanel.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/gui/__init__.py b/src/gui/__init__.py index f461b3e..b700273 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["controller"] +__all__ = ["controller", "logPanel"] diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 11f5c63..8cbb924 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -692,11 +692,5 @@ each direction. (Default: 0) </property> </object> </child> </object> - <object class="GtkTextBuffer" id="textbuffer_log"> - <property name="text" translatable="yes">16:09:20 [NOTICE] Bootstrapped 90%: Establishing a Tor circuit. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:24 [NOTICE] Bootstrapped 100%: Done. -</property> - </object> + <object class="GtkTextBuffer" id="textbuffer_log"/> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 4da82c9..8f27df4 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,7 +1,8 @@ import gobject import gtk -from util import torTools +from util import log, torTools +from gui import logPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -17,14 +18,15 @@ class GuiController: self.bwStats = bandwidthStats.BandwidthStats(self.builder) self.bwStats.pack_widgets() + self.logPanel = logPanel.LogPanel(self.builder) + self.logPanel.pack_widgets() + + log.log(log.DEBUG, "Hello World!") + log.log(log.ERR, "Hello Again!") + def run(self): window = self.builder.get_object('window_main') - textbuffer = self.builder.get_object('textbuffer_log') - conn = torTools.getConn() - torPid = conn.getMyPid() - textbuffer.set_text("Tor pid: %s" % torPid) - window.show_all() gtk.main() diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py new file mode 100644 index 0000000..174ed64 --- /dev/null +++ b/src/gui/logPanel.py @@ -0,0 +1,56 @@ +""" +Base class for implementing graphing functionality. +""" + +import random +import sys + +from collections import deque + +import gobject +import gtk + +from TorCtl import TorCtl +from util import log, uiTools, torTools + +from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry + +class LogPanel: + def __init__(self, builder): + self.builder = builder + + self.msgLog = deque() + + log.LOG_LOCK.acquire() + try: + armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] + log.addListeners(armRunlevels, self._register_arm_event) + finally: + log.LOG_LOCK.release() + + textbuffer = self.builder.get_object('textbuffer_log') + + for color in RUNLEVEL_EVENT_COLOR.values(): + textbuffer.create_tag(color, foreground=color) + + gobject.timeout_add(1000, self.print_log) + + def print_log(self): + textbuffer = self.builder.get_object('textbuffer_log') + start, end = textbuffer.get_bounds() + textbuffer.delete(start, end) + + for entry in self.msgLog: + iter = textbuffer.get_iter_at_mark(textbuffer.get_insert()) + textbuffer.insert_with_tags_by_name(iter, entry.getDisplayMessage() + "\n", entry.color) + + def register_event(self, event): + self.msgLog.appendleft(event) + + def pack_widgets(self): + pass + + def _register_arm_event(self, level, msg, eventTime): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) +

1 0

[arm/master] Use a tree view for prettifying log entries.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit c9ac18befb91178fdcd4fb86c9fcbd503396c889 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jun 20 18:14:30 2011 +0500 Use a tree view for prettifying log entries. (In future, this can prove to be helpful by being sortable.) --- src/gui/arm.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- src/gui/logPanel.py | 21 +++++++------------ 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 8cbb924..f067542 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -134,6 +134,18 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore_log"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkWindow" id="window_main"> <property name="title" translatable="yes">arm</property> <property name="default_width">640</property> @@ -672,10 +684,46 @@ each direction. (Default: 0) </property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTextView" id="textview_log"> + <object class="GtkTreeView" id="treeview_log"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="buffer">textbuffer_log</property> + <property name="model">liststore_log</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> + <property name="title">Time</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_timestamp"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_log_type"> + <property name="title">Type</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_type"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_msg"> + <property name="title">Message</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_msg"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> + </object> + </child> </object> </child> </object> diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 174ed64..bacc6f2 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -4,6 +4,7 @@ Base class for implementing graphing functionality. import random import sys +import time from collections import deque @@ -28,24 +29,18 @@ class LogPanel: finally: log.LOG_LOCK.release() - textbuffer = self.builder.get_object('textbuffer_log') - - for color in RUNLEVEL_EVENT_COLOR.values(): - textbuffer.create_tag(color, foreground=color) - - gobject.timeout_add(1000, self.print_log) - - def print_log(self): - textbuffer = self.builder.get_object('textbuffer_log') - start, end = textbuffer.get_bounds() - textbuffer.delete(start, end) + def fill_log(self): + liststore = self.builder.get_object('liststore_log') + liststore.clear() for entry in self.msgLog: - iter = textbuffer.get_iter_at_mark(textbuffer.get_insert()) - textbuffer.insert_with_tags_by_name(iter, entry.getDisplayMessage() + "\n", entry.color) + timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) + row = (timeLabel, entry.type, entry.msg, entry.color) + liststore.append(row) def register_event(self, event): self.msgLog.appendleft(event) + self.fill_log() def pack_widgets(self): pass

1 0

[arm/master] Allow user to sort log entries in preferred order.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit e5ae0d0a95b2739e3e1ec281eeab4f76d779087a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 21 16:38:18 2011 +0500 Allow user to sort log entries in preferred order. --- src/gui/arm.xml | 18 +++++++++++------- src/gui/controller.py | 11 +++++++++-- src/gui/logPanel.py | 13 +++++++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index f067542..1e3681c 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -136,6 +136,8 @@ </object> <object class="GtkListStore" id="liststore_log"> <columns> +  + <column type="gulong"/>  <column type="gchararray"/>  @@ -691,11 +693,14 @@ each direction. (Default: 0) </property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> + <property name="sort_indicator">True</property> + <property name="sort_order">descending</property> + <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_timestamp"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">1</attribute> </attributes> </child> </object> @@ -706,8 +711,8 @@ each direction. (Default: 0) </property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_type"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">2</attribute> </attributes> </child> </object> @@ -718,8 +723,8 @@ each direction. (Default: 0) </property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_msg"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">3</attribute> </attributes> </child> </object> @@ -740,5 +745,4 @@ each direction. (Default: 0) </property> </object> </child> </object> - <object class="GtkTextBuffer" id="textbuffer_log"/> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 8f27df4..c5c8767 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,6 +1,9 @@ import gobject import gtk +import thread +import time + from util import log, torTools from gui import logPanel from gui.graphing import bandwidthStats @@ -21,8 +24,12 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - log.log(log.DEBUG, "Hello World!") - log.log(log.ERR, "Hello Again!") + def random_entries(): + while True: + log.log(log.DEBUG, "Hello World at %s" % time.asctime(time.localtime())) + time.sleep(5) + + thread.start_new_thread(random_entries, ()) def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index bacc6f2..7197178 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -35,7 +35,7 @@ class LogPanel: for entry in self.msgLog: timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) - row = (timeLabel, entry.type, entry.msg, entry.color) + row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) def register_event(self, event): @@ -43,7 +43,16 @@ class LogPanel: self.fill_log() def pack_widgets(self): - pass + liststore = self.builder.get_object('liststore_log') + + liststore.set_sort_func(1, self._compare_rows) + liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) + + def _compare_rows(self, treemodel, iter1, iter2, data=None): + timestamp_raw1 = treemodel.get(iter1, 0) + timestamp_raw2 = treemodel.get(iter2, 0) + + return cmp(timestamp_raw1, timestamp_raw2) def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0

[arm/master] Connect a TorEventObserver instance with LogPanel.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 4ea211ffc54b4c32b9d7cc90e4b395523145484b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 22 01:15:50 2011 +0500 Connect a TorEventObserver instance with LogPanel. --- src/gui/controller.py | 7 +------ src/gui/logPanel.py | 13 ++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index c5c8767..090cc31 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -24,12 +24,7 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - def random_entries(): - while True: - log.log(log.DEBUG, "Hello World at %s" % time.asctime(time.localtime())) - time.sleep(5) - - thread.start_new_thread(random_entries, ()) + log.log(log.DEBUG, "Hello world!") def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 7197178..78b218a 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -14,7 +14,7 @@ import gtk from TorCtl import TorCtl from util import log, uiTools, torTools -from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry +from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry, TorEventObserver class LogPanel: def __init__(self, builder): @@ -22,12 +22,11 @@ class LogPanel: self.msgLog = deque() - log.LOG_LOCK.acquire() - try: - armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] - log.addListeners(armRunlevels, self._register_arm_event) - finally: - log.LOG_LOCK.release() + armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] + log.addListeners(armRunlevels, self._register_arm_event) + + conn = torTools.getConn() + conn.addEventListener(TorEventObserver(self.register_event)) def fill_log(self): liststore = self.builder.get_object('liststore_log')

1 0

[arm/master] Migrate CLI code for fetching backlogs as well as TorCtl events.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 7b6d513582ab48619c3ee27bd1baabbfb9b9e9f8 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 25 14:58:34 2011 +0500 Migrate CLI code for fetching backlogs as well as TorCtl events. --- src/gui/logPanel.py | 56 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 78b218a..ab8eb4d 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -14,19 +14,59 @@ import gtk from TorCtl import TorCtl from util import log, uiTools, torTools -from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry, TorEventObserver +from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, + LogEntry, TorEventObserver, + DEFAULT_CONFIG, RUNLEVEL_EVENT_COLOR) + +STARTUP_EVENTS = 'N3' class LogPanel: def __init__(self, builder): self.builder = builder + self._config = dict(DEFAULT_CONFIG) self.msgLog = deque() + self.loggedEvents = setEventListening(expandEvents(STARTUP_EVENTS)) + + torEventBacklog = deque() + if self._config["features.log.prepopulate"]: + setRunlevels = list(set.intersection(set(self.loggedEvents), set(log.Runlevel.values()))) + readLimit = self._config["features.log.prepopulateReadLimit"] + addLimit = self._config["cache.logPanel.size"] + torEventBacklog = deque(getLogFileEntries(setRunlevels, readLimit, addLimit, self._config)) armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] log.addListeners(armRunlevels, self._register_arm_event) + setRunlevels = [] + for i in range(len(armRunlevels)): + if "ARM_" + log.Runlevel.values()[i] in self.loggedEvents: + setRunlevels.append(armRunlevels[i]) + + armEventBacklog = deque() + for level, msg, eventTime in log._getEntries(setRunlevels): + armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) + armEventBacklog.appendleft(armEventEntry) + + while armEventBacklog or torEventBacklog: + if not armEventBacklog: + self.msgLog.append(torEventBacklog.popleft()) + elif not torEventBacklog: + self.msgLog.append(armEventBacklog.popleft()) + elif armEventBacklog[0].timestamp < torEventBacklog[0].timestamp: + self.msgLog.append(torEventBacklog.popleft()) + else: + self.msgLog.append(armEventBacklog.popleft()) + conn = torTools.getConn() conn.addEventListener(TorEventObserver(self.register_event)) + conn.addTorCtlListener(self._register_torctl_event) + + def pack_widgets(self): + liststore = self.builder.get_object('liststore_log') + + liststore.set_sort_func(1, self._compare_rows) + liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) def fill_log(self): liststore = self.builder.get_object('liststore_log') @@ -41,11 +81,13 @@ class LogPanel: self.msgLog.appendleft(event) self.fill_log() - def pack_widgets(self): - liststore = self.builder.get_object('liststore_log') + def _register_arm_event(self, level, msg, eventTime): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) - liststore.set_sort_func(1, self._compare_rows) - liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) + def _register_torctl_event(self, level, msg): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(time.time(), "TORCTL_%s" % level, msg, eventColor)) def _compare_rows(self, treemodel, iter1, iter2, data=None): timestamp_raw1 = treemodel.get(iter1, 0) @@ -53,7 +95,3 @@ class LogPanel: return cmp(timestamp_raw1, timestamp_raw2) - def _register_arm_event(self, level, msg, eventTime): - eventColor = RUNLEVEL_EVENT_COLOR[level] - self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) -

1 0

[arm/master] Remove debug log statement and update log panel regularly via gobject.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 01529c340943a2b82cb6b98902e38cd10b4fcb86 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 25 15:06:55 2011 +0500 Remove debug log statement and update log panel regularly via gobject. --- src/gui/controller.py | 2 -- src/gui/logPanel.py | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 090cc31..1c173af 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -24,8 +24,6 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - log.log(log.DEBUG, "Hello world!") - def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index ab8eb4d..0a00137 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -62,6 +62,8 @@ class LogPanel: conn.addEventListener(TorEventObserver(self.register_event)) conn.addTorCtlListener(self._register_torctl_event) + gobject.timeout_add(1000, self.fill_log) + def pack_widgets(self): liststore = self.builder.get_object('liststore_log') @@ -77,9 +79,10 @@ class LogPanel: row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) + return True + def register_event(self, event): self.msgLog.appendleft(event) - self.fill_log() def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0