July 2011 - tor-commits - lists.torproject.org

[arm/release] fix: Flushing torrc display cache when invisible
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 80003ef45f1e4280f47fbbb0b39f2c74f75907de Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 11 21:10:08 2011 -0700 fix: Flushing torrc display cache when invisible Previously overwriting our torrc by saving it would flush this cache, but at its new location in the config panel this isn't a great option (I'm trying to avoid cross-panel communication). A better solution is to just flush this cache whenever we're turned invisible. --- src/cli/torrcPanel.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 75ddd1b..af6f4d6 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -77,6 +77,12 @@ class TorrcPanel(panel.Panel): self.valsLock.release() return isKeystrokeConsumed + def setVisible(self, isVisible): + if not isVisible: + self._lastContentHeightArgs = None # redraws when next displayed + + panel.Panel.setVisible(self, isVisible) + def getHelp(self): options = [] options.append(("up arrow", "scroll up a line", None))

1 0

[arm/release] fix: dropping T-connector from config save dialog
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit f0a75a36b184f9590a7c04c299b6b137933152ea Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 10 09:22:54 2011 -0700 fix: dropping T-connector from config save dialog Trying to get the config save dialog to display the right pipe connectors to dynamically align with the below content is a pita so gonna stop trying. There's three use cases... - dialog is larger than the detail section, no scroll bars -> display box - dialog is larger and there are scroll bars -> show T-connector on left - dialog is smaller than the detail section -> show connectors on both sides Trying to get enough context to the dialog really isn't worth the hassle, so just opting to show a simple box in all situations. --- src/cli/configPanel.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index f5ff442..6ec3fce 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -377,9 +377,6 @@ class ConfigPanel(panel.Panel): else: popup.addstr(i + 1, 1, line, curses.A_BOLD | uiTools.getColor("green")) - # draws 'T' between the lower left and the covered panel's scroll bar - if width > 1: popup.win.addch(height - 1, 1, curses.ACS_TTEE) - # draws selection options (drawn right to left) drawX = width - 1 for i in range(len(selectionOptions) - 1, -1, -1):

1 0

[arm/release] Using SAVECONF when able to persist torrc
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d28bb39099548f46c97a1a11e5dd31bae0a47e41 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 11 21:42:05 2011 -0700 Using SAVECONF when able to persist torrc Moving config saving to the torConfig utility, and making it save via SAVECONF if it's equivilant (the contents and destination matches tor's state). This also includes other minor fixes and changes (like a bit more logging). --- src/cli/configPanel.py | 28 ++++--------------- src/util/torConfig.py | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 22 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 6ec3fce..7c1a62e 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -3,14 +3,13 @@ Panel presenting the configuration state for tor or arm. Options can be edited and the resulting configuration files saved. """ -import os import curses import threading import controller import popups -from util import conf, enum, panel, torTools, torConfig, uiTools +from util import conf, enum, panel, sysTools, torConfig, torTools, uiTools DEFAULT_CONFIG = {"features.config.selectionDetails.height": 6, "features.config.prepopulateEditValues": True, @@ -401,35 +400,20 @@ class ConfigPanel(panel.Panel): elif key == curses.KEY_RIGHT: selection = min(len(selectionOptions) - 1, selection + 1) if selection in (0, 1): - loadedTorrc = torConfig.getTorrc() + loadedTorrc, promptCanceled = torConfig.getTorrc(), False try: configLocation = loadedTorrc.getConfigLocation() except IOError: configLocation = "" if selection == 1: # prompts user for a configuration location configLocation = popups.inputPrompt("Save to (esc to cancel): ", configLocation) - if configLocation: configLocation = os.path.abspath(configLocation) + if not configLocation: promptCanceled = True - if configLocation: + if not promptCanceled: try: - # make dir if the path doesn't already exist - baseDir = os.path.dirname(configLocation) - if not os.path.exists(baseDir): os.makedirs(baseDir) - - # saves the configuration to the file - configFile = open(configLocation, "w") - configFile.write("\n".join(configLines)) - configFile.close() - - # reloads the cached torrc if overwriting it - if configLocation == loadedTorrc.getConfigLocation(): - try: - loadedTorrc.load() - panels["torrc"]._lastContentHeightArgs = None - except IOError: pass - + torConfig.saveConf(configLocation, configLines) msg = "Saved configuration to %s" % configLocation - except (IOError, OSError), exc: + except IOError, exc: msg = "Unable to save configuration (%s)" % sysTools.getFileErrorMsg(exc) popups.showMsg(msg, 2) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 030a169..4a25f0f 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -3,6 +3,7 @@ Helper functions for working with tor's configuration file. """ import os +import time import socket import threading @@ -381,6 +382,74 @@ def getCustomOptions(includeValue = False): if includeValue: return configLines else: return [line[:line.find(" ")] for line in configLines] +def saveConf(destination = None, contents = None): + """ + Saves the configuration to the given path. If this is equivilant to + issuing a SAVECONF (the contents and destination match what tor's using) + then that's done. Otherwise, this writes the contents directly. This raises + an IOError if unsuccessful. + + Arguments: + destination - path to be saved to, the current config location if None + contents - configuration to be saved, the current config if None + """ + + if destination: + destination = os.path.abspath(destination) + + # fills default config values, and sets isSaveconf to false if they differ + # from the arguments + isSaveconf, startTime = True, time.time() + + currentConfig = getCustomOptions(True) + if not contents: contents = currentConfig + else: isSaveconf &= contents == currentConfig + + currentLocation = None + try: + currentLocation = getConfigLocation() + if not destination: destination = currentLocation + else: isSaveconf &= destination == currentLocation + except IOError: pass + + if not destination: raise IOError("unable to determine the torrc's path") + logMsg = "Saved config by %%s to %s (runtime: %%0.4f)" % destination + + # attempts SAVECONF if we're updating our torrc with the current state + if isSaveconf: + try: + torTools.getConn().getTorCtl().save_conf() + + try: getTorrc().load() + except IOError: pass + + log.log(log.DEBUG, logMsg % ("SAVECONF", time.time() - startTime)) + return # if successful then we're done + except: + # example error: + # TorCtl.TorCtl.ErrorReply: 551 Unable to write configuration to disk. + pass + + # if the SAVECONF fails or this is a custom save then write contents directly + try: + # make dir if the path doesn't already exist + baseDir = os.path.dirname(destination) + if not os.path.exists(baseDir): os.makedirs(baseDir) + + # saves the configuration to the file + configFile = open(destination, "w") + configFile.write("\n".join(contents)) + configFile.close() + except (IOError, OSError), exc: + raise IOError(exc) + + # reloads the cached torrc if overwriting it + if destination == currentLocation: + try: getTorrc().load() + except IOError: pass + + log.log(log.DEBUG, logMsg % ("directly writing", time.time() - startTime)) + def validate(contents = None): """ Performs validation on the given torrc contents, providing back a listing of

1 0

[arm/release] fix: Misparsing config types for old tor versions
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3d11f21692fbb30589181c1ed66e71250ffc89e6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 07:53:58 2011 -0700 fix: Misparsing config types for old tor versions Queries of "GETINFO config/names" can provide documentation as an optional third argument. This only appears to happen for older tor versions (like 0.2.1.25). I was misparsing this, so the documentation was considered to be part of the argument type. --- src/cli/configPanel.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 7c1a62e..13e4343 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -203,9 +203,12 @@ class ConfigPanel(panel.Panel): configOptionLines = conn.getInfo("config/names", "").strip().split("\n") for line in configOptionLines: - # lines are of the form "<option> <type>", like: + # lines are of the form "<option> <type>[ <documentation>]", like: # UseEntryGuards Boolean - confOption, confType = line.strip().split(" ", 1) + # documentation is aparently only in older versions (for instance, + # 0.2.1.25) + lineComp = line.strip().split(" ") + confOption, confType = lineComp[0], lineComp[1] # skips private and virtual entries if not configured to show them if not self._config["features.config.state.showPrivateOptions"] and confOption.startswith("__"):

1 0

[arm/release] fix: intermediate graph bounds sometimes missing
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 0a17e8cec7619cd9d9343a48e6d971f3d4d833d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:14:31 2011 -0700 fix: intermediate graph bounds sometimes missing Graph bounds are omitted if they match the max or min bound (since, say, showing the second tick up as '0' really doesn't make sense). However, integer truncation caused many intermediate ticks to be rounded down to zero, and even if visible be inaccurate. --- src/cli/graphing/graphPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index c419119..ecf8c68 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -367,11 +367,11 @@ class GraphPanel(panel.Panel): if self.graphHeight % 2 == 0 and i >= (ticks / 2): row -= 1 if primaryMinBound != primaryMaxBound: - primaryVal = (primaryMaxBound - primaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1) + primaryVal = (primaryMaxBound - primaryMinBound) * (self.graphHeight - row - 1) / (self.graphHeight - 1) if not primaryVal in (primaryMinBound, primaryMaxBound): self.addstr(row + 2, 0, "%4i" % primaryVal, primaryColor) if secondaryMinBound != secondaryMaxBound: - secondaryVal = (secondaryMaxBound - secondaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1) + secondaryVal = (secondaryMaxBound - secondaryMinBound) * (self.graphHeight - row - 1) / (self.graphHeight - 1) if not secondaryVal in (secondaryMinBound, secondaryMaxBound): self.addstr(row + 2, graphCol + 5, "%4i" % secondaryVal, secondaryColor) # creates bar graph (both primary and secondary)

1 0

[arm/release] Moving graph panel resizing to the graph panel
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 62a0e17f2ff9d3d44d82ca43360fa6da8eb21d54 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:04:41 2011 -0700 Moving graph panel resizing to the graph panel --- src/cli/controller.py | 15 --------------- src/cli/graphing/graphPanel.py | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index dc82d65..035ef07 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -919,21 +919,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["graph"].redraw(True) - elif page == 0 and key in (ord('n'), ord('N'), ord('m'), ord('M')): - # Unfortunately modifier keys don't work with the up/down arrows (sending - # multiple keycodes. The only exception to this is shift + left/right, - # but for now just gonna use standard characters. - - if key in (ord('n'), ord('N')): - panels["graph"].setGraphHeight(panels["graph"].graphHeight - 1) - else: - # don't grow the graph if it's already consuming the whole display - # (plus an extra line for the graph/log gap) - maxHeight = panels["graph"].parent.getmaxyx()[0] - panels["graph"].top - currentHeight = panels["graph"].getHeight() - - if currentHeight < maxHeight + 1: - panels["graph"].setGraphHeight(panels["graph"].graphHeight + 1) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 0c52f6f..c419119 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -256,7 +256,22 @@ class GraphPanel(panel.Panel): def handleKey(self, key): isKeystrokeConsumed = True - if key == ord('s') or key == ord('S'): + if key in (ord('n'), ord('N'), ord('m'), ord('M')): + # Unfortunately modifier keys don't work with the up/down arrows (sending + # multiple keycodes). The only exception to this is shift + left/right, + # but for now just gonna use standard characters. + + if key in (ord('n'), ord('N')): + self.setGraphHeight(self.graphHeight - 1) + else: + # don't grow the graph if it's already consuming the whole display + # (plus an extra line for the graph/log gap) + maxHeight = self.parent.getmaxyx()[0] - self.top + currentHeight = self.getHeight() + + if currentHeight < maxHeight + 1: + self.setGraphHeight(self.graphHeight + 1) + elif key == ord('s') or key == ord('S'): # provides a menu to pick the graphed stats availableStats = self.stats.keys() availableStats.sort()

1 0

[arm/release] Moving descriptor popup out of the controller
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit dd1bde92b4d9b564cccb9bbd6fa3ba44fe3b41db Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 09:37:59 2011 -0700 Moving descriptor popup out of the controller Putting descriptor popup triggering into the connection panel, and revising descriptorPopup.py to use new styled popups. --- src/cli/connections/connPanel.py | 4 +++ src/cli/controller.py | 17 ------------ src/cli/descriptorPopup.py | 52 ++++++++++++++++++++++---------------- src/cli/popups.py | 5 ++- 4 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 8ecffc2..7fab33e 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -6,6 +6,7 @@ import time import curses import threading +import cli.descriptorPopup import cli.popups from cli.connections import entries, connEntry, circEntry @@ -191,6 +192,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): # applies new setting if selection != -1: self.setListingType(options[selection]) + elif key == ord('d') or key == ord('D'): + # presents popup for raw consensus data + cli.descriptorPopup.showDescriptorPopup(self) else: isKeystrokeConsumed = False self.valsLock.release() diff --git a/src/cli/controller.py b/src/cli/controller.py index c4b9442..20a4e7e 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -954,23 +954,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() - elif page == 1 and key in (ord('d'), ord('D')): - # presents popup for raw consensus data - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - curses.cbreak() # wait indefinitely for key presses (no timeout) - panelTitle = panels["conn"]._title - panels["conn"]._title = "" - panels["conn"].redraw(True) - - descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn"]) - - panels["conn"]._title = panelTitle - setPauseState(panels, isPaused, page) - curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior - finally: - panel.CURSES_LOCK.release() else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index d57546c..920f2bc 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -7,6 +7,7 @@ import curses import controller import connections.connEntry +import popups from util import panel, torTools, uiTools # field keywords used to identify areas for coloring @@ -65,7 +66,7 @@ class PopupProperties: elif key == curses.KEY_PPAGE: self.scroll = max(self.scroll - height, 0) elif key == curses.KEY_NPAGE: self.scroll = max(0, min(self.scroll + height, len(self.text) - height)) -def showDescriptorPopup(popup, stdscr, connectionPanel): +def showDescriptorPopup(connectionPanel): """ Presents consensus descriptor in popup window with the following controls: Up, Down, Page Up, Page Down - scroll descriptor @@ -73,10 +74,16 @@ def showDescriptorPopup(popup, stdscr, connectionPanel): Enter, Space, d, D - close popup """ + # hides the title of the first panel on the page + topPanel = controller.getPanels(controller.getPage())[0] + topPanel.setTitleVisible(False) + topPanel.redraw(True) + properties = PopupProperties() isVisible = True - if not panel.CURSES_LOCK.acquire(False): return + panel.CURSES_LOCK.acquire() + try: while isVisible: selection = connectionPanel._scroller.getCursorSelection(connectionPanel._entryLines) @@ -96,29 +103,30 @@ def showDescriptorPopup(popup, stdscr, connectionPanel): # tracks number of extra lines that will be taken due to text wrap height += (lineWidth - 2) / connectionPanel.maxX - popup.setHeight(min(len(properties.text) + height + 2, connectionPanel.maxY)) - popup.recreate(stdscr, width) - while isVisible: - draw(popup, properties) - key = stdscr.getch() + popupHeight = min(len(properties.text) + height + 2, connectionPanel.maxY) + popup, _, _ = popups.init(popupHeight, width) + if not popup: break - if uiTools.isSelectionKey(key) or key in (ord('d'), ord('D')): - # closes popup - isVisible = False - elif key in (curses.KEY_LEFT, curses.KEY_RIGHT): - # navigation - pass on to connPanel and recreate popup - connectionPanel.handleKey(curses.KEY_UP if key == curses.KEY_LEFT else curses.KEY_DOWN) - break - else: properties.handleKey(key, popup.height - 2) - - popup.setHeight(9) - popup.recreate(stdscr, 80) - finally: - panel.CURSES_LOCK.release() + try: + draw(popup, properties) + key = controller.getScreen().getch() + + if uiTools.isSelectionKey(key) or key in (ord('d'), ord('D')): + # closes popup + isVisible = False + elif key in (curses.KEY_LEFT, curses.KEY_RIGHT): + # navigation - pass on to connPanel and recreate popup + connectionPanel.handleKey(curses.KEY_UP if key == curses.KEY_LEFT else curses.KEY_DOWN) + break + else: properties.handleKey(key, popup.height - 2) + finally: popups.finalize() + finally: panel.CURSES_LOCK.release() + + topPanel.setTitleVisible(True) def draw(popup, properties): - popup.clear() + popup.win.erase() popup.win.box() xOffset = 2 @@ -174,5 +182,5 @@ def draw(popup, properties): lineNum += 1 if lineNum > pageHeight: break - popup.refresh() + popup.win.refresh() diff --git a/src/cli/popups.py b/src/cli/popups.py index 2b02685..de4bad6 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -301,9 +301,10 @@ def showMenu(title, options, oldSelection): elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel - topPanel.setTitleVisible(True) curses.halfdelay(controller.REFRESH_RATE * 10) # reset normal pausing behavior - finally: finalize() + finally: + topPanel.setTitleVisible(True) + finalize() return selection

1 0

[arm/release] Moving log panel clearing handler to the log panel
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit bafcb04a9843443290dbfe697f5467f441941806 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 19:00:21 2011 -0700 Moving log panel clearing handler to the log panel --- src/cli/controller.py | 20 -------------------- src/cli/logPanel.py | 4 ++++ src/cli/popups.py | 6 ++++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 20a4e7e..dc82d65 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -934,26 +934,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if currentHeight < maxHeight + 1: panels["graph"].setGraphHeight(panels["graph"].graphHeight + 1) - elif page == 0 and (key == ord('c') or key == ord('C')): - # provides prompt to confirm that arm should clear the log - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("This will clear the log. Are you sure (c again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - if confirmationKey in (ord('c'), ord('C')): panels["log"].clear() - - # reverts display settings - curses.halfdelay(REFRESH_RATE * 10) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index d34b640..745cb57 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -767,6 +767,10 @@ class LogPanel(panel.Panel, threading.Thread): self.showDuplicates = not self.showDuplicates self.redraw(True) self.valsLock.release() + elif key == ord('c') or key == ord('C'): + msg = "This will clear the log. Are you sure (c again to confirm)?" + keyPress = popups.showMsg(msg, attr = curses.A_BOLD) + if keyPress in (ord('c'), ord('C')): self.clear() elif key == ord('f') or key == ord('F'): # Provides menu to pick regular expression filters or adding new ones: # for syntax see: http://docs.python.org/library/re.html#regular-expression-syntax diff --git a/src/cli/popups.py b/src/cli/popups.py index de4bad6..b957186 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -66,7 +66,7 @@ def inputPrompt(msg, initialValue = ""): def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): """ Displays a single line message on the control line for a set time. Pressing - any key will end the message. + any key will end the message. This returns the key pressed. Arguments: msg - message to be displayed to the user @@ -81,10 +81,12 @@ def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): if maxWait == -1: curses.cbreak() else: curses.halfdelay(maxWait * 10) - controller.getScreen().getch() + keyPress = controller.getScreen().getch() controlPanel.revertMsg() curses.halfdelay(controller.REFRESH_RATE * 10) panel.CURSES_LOCK.release() + + return keyPress def showHelpPopup(): """

1 0

[arm/release] Moving event logging selection to the log panel
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4986780baff0740a7c55eaf7717697f54e305a5d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 20:45:55 2011 -0700 Moving event logging selection to the log panel --- src/cli/controller.py | 77 ------------------------------------------------- src/cli/logPanel.py | 56 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 79 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 035ef07..84205cb 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -277,32 +277,6 @@ def setPauseState(panels, monitorIsPaused, currentPage, overwrite=False): for key in allPanels: panels[key].setPaused(overwrite or monitorIsPaused or (key not in PAGES[currentPage] and key not in PAGE_S)) -def setEventListening(selectedEvents, isBlindMode): - # creates a local copy, note that a suspected python bug causes *very* - # puzzling results otherwise when trying to discard entries (silently - # returning out of this function!) - events = set(selectedEvents) - isLoggingUnknown = "UNKNOWN" in events - - # removes special types only used in arm (UNKNOWN, TORCTL, ARM_DEBUG, etc) - toDiscard = [] - for eventType in events: - if eventType not in logPanel.TOR_EVENT_TYPES.values(): toDiscard += [eventType] - - for eventType in list(toDiscard): events.discard(eventType) - - # adds events unrecognized by arm if we're listening to the 'UNKNOWN' type - if isLoggingUnknown: - events.update(set(logPanel.getMissingEventTypes())) - - setEvents = torTools.getConn().setControllerEvents(list(events)) - - # temporary hack for providing user selected events minus those that failed - # (wouldn't be a problem if I wasn't storing tor and non-tor events together...) - returnVal = list(selectedEvents.difference(torTools.FAILED_EVENTS)) - returnVal.sort() # alphabetizes - return returnVal - def connResetListener(conn, eventType): """ Pauses connection resolution when tor's shut down, and resumes if started @@ -507,7 +481,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if isSuccessful: panels["graph"].updateInterval = 4 # tells Tor to listen to the events we're interested - loggedEvents = setEventListening(loggedEvents, isBlindMode) #panels["log"].loggedEvents = loggedEvents # strips any that couldn't be set panels["log"].setLoggedEvents(loggedEvents) # strips any that couldn't be set @@ -869,56 +842,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["graph"].redraw(True) - elif page == 0 and (key == ord('e') or key == ord('E')): - # allow user to enter new types of events to log - unchanged if left blank - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Events to log: ") - panels["control"].redraw(True) - - # lists event types - popup = panels["popup"] - popup.height = 11 - popup.recreate(stdscr, 80) - - popup.clear() - popup.win.box() - popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) - lineNum = 1 - for line in logPanel.EVENT_LISTING.split("\n"): - line = line[6:] - popup.addstr(lineNum, 1, line) - lineNum += 1 - popup.refresh() - - # gets user input (this blocks monitor updates) - eventsInput = panels["control"].getstr(0, 15) - if eventsInput: eventsInput = eventsInput.replace(' ', '') # strips spaces - - # it would be nice to quit on esc, but looks like this might not be possible... - if eventsInput: - try: - expandedEvents = logPanel.expandEvents(eventsInput) - loggedEvents = setEventListening(expandedEvents, isBlindMode) - panels["log"].setLoggedEvents(loggedEvents) - except ValueError, exc: - panels["control"].setMsg("Invalid flags: %s" % str(exc), curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(2) - - # reverts popup dimensions - popup.height = 9 - popup.recreate(stdscr, 80) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() - - panels["graph"].redraw(True) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 745cb57..75cdab5 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -163,6 +163,28 @@ def getMissingEventTypes(): return [event for event in torEventTypes if not event in armEventTypes] else: return None # GETINFO call failed +def setEventListening(events): + """ + Configures the events Tor listens for, filtering non-tor events from what we + request from the controller. This returns a sorted list of the events we + successfully set. + + Arguments: + events - event types to attempt to set + """ + + events = set(events) # drops duplicates + torEvents = events.intersection(set(TOR_EVENT_TYPES.values())) + + # adds events unrecognized by arm if we're listening to the 'UNKNOWN' type + if "UNKNOWN" in events: + torEvents.update(set(getMissingEventTypes())) + + setEvents = torTools.getConn().setControllerEvents(list(torEvents)) + + # provides back the input set minus events we failed to set + return sorted(events.difference(torTools.FAILED_EVENTS)) + def loadLogMessages(): """ Fetches a mapping of common log messages to their runlevels from the config. @@ -552,6 +574,10 @@ class LogPanel(panel.Panel, threading.Thread): # collapses duplicate log entries if false, showing only the most recent self.showDuplicates = self._config["features.log.showDuplicateEntries"] + # restricts the input to the set of events we can listen to, and + # configures the controller to liten to them + loggedEvents = setEventListening(loggedEvents) + self.setPauseAttr("msgLog") # tracks the message log when we're paused self.msgLog = [] # log entries, sorted by the timestamp self.loggedEvents = loggedEvents # events we're listening to @@ -693,9 +719,12 @@ class LogPanel(panel.Panel, threading.Thread): """ if eventTypes == self.loggedEvents: return - self.valsLock.acquire() - self.loggedEvents = eventTypes + + # configures the controller to listen for these tor events, and provides + # back a subset without anything we're failing to listen to + setTypes = setEventListening(eventTypes) + self.loggedEvents = setTypes self.redraw(True) self.valsLock.release() @@ -815,6 +844,29 @@ class LogPanel(panel.Panel, threading.Thread): panel.CURSES_LOCK.release() if len(self.filterOptions) > MAX_REGEX_FILTERS: del self.filterOptions[MAX_REGEX_FILTERS:] + elif key == ord('e') or key == ord('E'): + # allow user to enter new types of events to log - unchanged if left blank + popup, width, height = popups.init(11, 80) + + if popup: + try: + # displays the available flags + popup.win.box() + popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) + eventLines = EVENT_LISTING.split("\n") + + for i in range(len(eventLines)): + popup.addstr(i + 1, 1, eventLines[i][6:]) + + popup.win.refresh() + + userInput = popups.inputPrompt("Events to log: ") + if userInput: + userInput = userInput.replace(' ', '') # strips spaces + try: self.setLoggedEvents(expandEvents(userInput)) + except ValueError, exc: + popups.showMsg("Invalid flags: %s" % str(exc), 2) + finally: popups.finalize() else: isKeystrokeConsumed = False return isKeystrokeConsumed

1 0

[arm/release] Removing unused dimension arguments
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 0df2a7b33a3ffc49b1fd38b53aeaa4314d025eba Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:02:14 2011 -0700 Removing unused dimension arguments Minor refactoring change suggested by pylint. --- src/cli/popups.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/popups.py b/src/cli/popups.py index b957186..dd56bfa 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -95,7 +95,7 @@ def showHelpPopup(): properly, this is an arrow, enter, or scroll key then this returns None. """ - popup, width, height = init(9, 80) + popup, _, height = init(9, 80) if not popup: return exitKey = None @@ -172,7 +172,7 @@ def showSortDialog(title, options, oldSelection, optionColors): optionColors - mappings of options to their color """ - popup, width, height = init(9, 80) + popup, _, _ = init(9, 80) if not popup: return newSelections = [] # new ordering @@ -272,7 +272,7 @@ def showMenu(title, options, oldSelection): """ maxWidth = max([len(label) for label in options]) + 9 - popup, width, height = init(len(options) + 2, maxWidth) + popup, _, _ = init(len(options) + 2, maxWidth) if not popup: return key, selection = 0, oldSelection if oldSelection != -1 else 0

1 0