<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15619] CalendarServer/trunk/calendarserver/tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15619">15619</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 16:32:26 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop dashview from excessively reading from dashcollect. Only need to read once per cycle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashcollectpy">CalendarServer/trunk/calendarserver/tools/dashcollect.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdashviewpy">CalendarServer/trunk/calendarserver/tools/dashview.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashcollectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashcollect.py (15618 => 15619)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-19 22:17:08 UTC (rev 15618)
+++ CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-19 23:32:26 UTC (rev 15619)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx">
</span><span class="cx"> class CollectorRequestHandler(SocketServer.BaseRequestHandler):
</span><span class="cx"> """
</span><del>- Request handler for L{CollectorService} that just sends back the current dat.
</del><ins>+ Request handler for L{CollectorService} that just sends back the current data.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def handle(self):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdashviewpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashview.py (15618 => 15619)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashview.py 2016-05-19 22:17:08 UTC (rev 15618)
+++ CalendarServer/trunk/calendarserver/tools/dashview.py 2016-05-19 23:32:26 UTC (rev 15619)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> import time
</span><span class="cx">
</span><span class="cx">
</span><del>-LOG_FILENAME = 'db.log'
-#logging.basicConfig(filename=LOG_FILENAME, level=logging.DEBUG)
</del><ins>+LOG_FILENAME = "db.log"
+logging.basicConfig(filename=LOG_FILENAME, level=logging.DEBUG)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -144,6 +144,7 @@
</span><span class="cx"> Create the initial window and run the L{scheduler}.
</span><span class="cx"> """
</span><span class="cx"> self.windows = []
</span><ins>+ self.client.update()
</ins><span class="cx"> self.displayWindow(None)
</span><span class="cx"> self.sched.enter(self.seconds, 0, self.updateDisplay, ())
</span><span class="cx"> self.sched.run()
</span><span class="lines">@@ -199,7 +200,7 @@
</span><span class="cx"> term_w, term_h = terminal_size()
</span><span class="cx"> logging.debug("HelpWindow: rows: %s cols: %s" % (term_h, term_w))
</span><span class="cx"> if int(term_w) > 100:
</span><del>- logging.debug('HelpWindow: term_w > 100, making window with top at %d' % (top))
</del><ins>+ logging.debug("HelpWindow: term_w > 100, making window with top at %d" % (top))
</ins><span class="cx"> self.windows.append(HelpWindow(self).makeWindow(top=help_top))
</span><span class="cx"> self.windows[-1].activate()
</span><span class="cx">
</span><span class="lines">@@ -212,14 +213,14 @@
</span><span class="cx"> Reset the current set of windows.
</span><span class="cx"> """
</span><span class="cx"> if self.windows:
</span><del>- logging.debug('resetting windows: %r' % (self.windows))
</del><ins>+ logging.debug("resetting windows: %r" % (self.windows))
</ins><span class="cx"> for window in self.windows:
</span><span class="cx"> window.deactivate()
</span><span class="cx"> old_windows = self.windows
</span><span class="cx"> self.windows = []
</span><span class="cx"> top = 0
</span><span class="cx"> for old in old_windows:
</span><del>- logging.debug('processing window of type %r' % (type(old)))
</del><ins>+ logging.debug("processing window of type %r" % (type(old)))
</ins><span class="cx"> self.windows.append(old.__class__(self).makeWindow(top=top))
</span><span class="cx"> self.windows[-1].activate()
</span><span class="cx"> # Allow the help window to float on the right edge
</span><span class="lines">@@ -245,10 +246,10 @@
</span><span class="cx"> lambda x: x.requiresUpdate() or initialUpdate,
</span><span class="cx"> self.windows
</span><span class="cx"> ):
</span><ins>+ logging.debug("updating: {}".format(window))
</ins><span class="cx"> window.update()
</span><span class="cx"> except Exception as e:
</span><span class="cx"> logging.debug("updateDisplay failed: {}".format(e))
</span><del>- pass
</del><span class="cx">
</span><span class="cx"> # Check keystrokes
</span><span class="cx"> self.processKeys()
</span><span class="lines">@@ -315,8 +316,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def pods(self):
</span><del>- self.client.update()
- return self.client.currentData["pods"].keys()
</del><ins>+ return self.client.currentData.get("pods", {}).keys()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def selectedPod(self):
</span><span class="lines">@@ -324,8 +324,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def serversForPod(self, pod):
</span><del>- self.client.update()
- return self.client.currentData["pods"][pod].keys()
</del><ins>+ return self.client.currentData.get("pods", {pod: {}})[pod].keys()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def selectedServer(self):
</span><span class="lines">@@ -373,14 +372,16 @@
</span><span class="cx"> else:
</span><span class="cx"> break
</span><span class="cx"> data = json.loads(data, object_pairs_hook=collections.OrderedDict)
</span><del>- logging.debug("data: {}".format(data))
</del><ins>+ logging.debug("data: {}".format(len(data)))
</ins><span class="cx"> self.socket.close()
</span><span class="cx"> self.socket = None
</span><del>- except socket.error:
</del><ins>+ except socket.error as e:
</ins><span class="cx"> data = {}
</span><span class="cx"> self.socket = None
</span><del>- except ValueError:
</del><ins>+ logging.debug("readSock: failed: {}".format(e))
+ except ValueError as e:
</ins><span class="cx"> data = {}
</span><ins>+ logging.debug("readSock: failed: {}".format(e))
</ins><span class="cx"> return data
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -447,7 +448,7 @@
</span><span class="cx"> self.dashboard = dashboard
</span><span class="cx"> self.rowCount = 0
</span><span class="cx"> self.needsReset = False
</span><del>- self.z_order = 'bottom'
</del><ins>+ self.z_order = "bottom"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def makeWindow(self, top=0, left=0):
</span><span class="lines">@@ -566,8 +567,8 @@
</span><span class="cx"> pt.y, pt.x, text,
</span><span class="cx"> style
</span><span class="cx"> )
</span><del>- except curses.error:
- pass
</del><ins>+ except curses.error as e:
+ logging.debug("tableRow: failed: {}".format(e))
</ins><span class="cx"> pt.yplus()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -607,7 +608,7 @@
</span><span class="cx"> self.window.erase()
</span><span class="cx">
</span><span class="cx"> pods = self.dashboard.pods()
</span><del>- width = max(map(len, pods))
</del><ins>+ width = max(map(len, pods)) if pods else 0
</ins><span class="cx">
</span><span class="cx"> pt = Point()
</span><span class="cx"> for row, pod in enumerate(pods):
</span></span></pre>
</div>
</div>
</body>
</html>