<!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>[15373] CalendarServer/trunk/calendarserver/tools/dashboard.py</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/15373">15373</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 09:49:04 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support viewing multiple servers (one at a time). Code refactor to simplify each panel.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashboardpy">CalendarServer/trunk/calendarserver/tools/dashboard.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashboardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashboard.py (15372 => 15373)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashboard.py 2015-12-08 21:44:13 UTC (rev 15372)
+++ CalendarServer/trunk/calendarserver/tools/dashboard.py 2015-12-09 17:49:04 UTC (rev 15373)
</span><span class="lines">@@ -20,12 +20,12 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> import argparse
</span><ins>+import collections
</ins><span class="cx"> import curses.panel
</span><span class="cx"> import errno
</span><span class="cx"> import fcntl
</span><span class="cx"> import json
</span><span class="cx"> import logging
</span><del>-import os
</del><span class="cx"> import sched
</span><span class="cx"> import socket
</span><span class="cx"> import struct
</span><span class="lines">@@ -34,60 +34,42 @@
</span><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> LOG_FILENAME = 'db.log'
</span><del>-# logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
</del><ins>+#logging.basicConfig(filename=LOG_FILENAME, level=logging.DEBUG)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def usage(e=None):
- name = os.path.basename(sys.argv[0])
- print("usage: %s [options]" % (name,))
- print("")
- print(" TODO: describe usage")
- print("")
- print("options:")
- print(" -h --help: print this help and exit")
- print(" -t: text output, not curses")
- print(" -s: server host (and optional port) [localhost:8100]")
- print(" or unix socket path prefixed by 'unix:'")
- print("")
-
- if e:
- sys.exit(64)
- else:
- sys.exit(0)
-
-
-
</del><span class="cx"> def main():
</span><span class="cx"> parser = argparse.ArgumentParser(description="Dashboard service for CalendarServer.")
</span><span class="cx"> parser.add_argument("-t", action="store_false", help="text output, not curses")
</span><del>- parser.add_argument("-s", default="localhost:8100", help="server host (and optional port), or unix socket path prefixed by 'unix:'")
</del><ins>+ parser.add_argument("-s", nargs="*", default=["localhost:8100"], help="server host (and optional port), or unix socket path prefixed by 'unix:'")
</ins><span class="cx"> args = parser.parse_args()
</span><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Get configuration
</span><span class="cx"> #
</span><span class="cx"> useCurses = args.t
</span><del>- if not args.s.startswith("unix:"):
- server = args.s.split(":")
- if len(server) == 1:
- server.append(8100)
</del><ins>+ servers = []
+ for server in args.s:
+ if not server.startswith("unix:"):
+ server = server.split(":")
+ if len(server) == 1:
+ server.append(8100)
+ else:
+ server[1] = int(server[1])
+ servers.append(tuple(server))
</ins><span class="cx"> else:
</span><del>- server[1] = int(server[1])
- server = tuple(server)
- else:
- server = args.s
</del><ins>+ servers.append(server)
</ins><span class="cx">
</span><span class="cx"> if useCurses:
</span><span class="cx"> def _wrapped(stdscrn):
</span><span class="cx"> curses.curs_set(0)
</span><span class="cx"> curses.use_default_colors()
</span><span class="cx"> curses.init_pair(1, curses.COLOR_RED, curses.COLOR_WHITE)
</span><del>- d = Dashboard(server, stdscrn, True)
</del><ins>+ d = Dashboard(servers, stdscrn, True)
</ins><span class="cx"> d.run()
</span><span class="cx"> curses.wrapper(_wrapped)
</span><span class="cx"> else:
</span><del>- d = Dashboard(server, None, False)
</del><ins>+ d = Dashboard(servers, None, False)
</ins><span class="cx"> d.run()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -121,20 +103,24 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> screen = None
</span><del>- registered_windows = {}
</del><ins>+ registered_windows = collections.OrderedDict()
</ins><span class="cx"> registered_window_sets = {
</span><span class="cx"> "H": ("HTTP Panels", [],),
</span><span class="cx"> "J": ("Jobs Panels", [],),
</span><span class="cx"> }
</span><del>- registered_order = []
</del><span class="cx">
</span><del>- def __init__(self, server, screen, usesCurses):
</del><ins>+ def __init__(self, servers, screen, usesCurses):
</ins><span class="cx"> self.screen = screen
</span><span class="cx"> self.usesCurses = usesCurses
</span><span class="cx"> self.paused = False
</span><span class="cx"> self.seconds = 0.1 if usesCurses else 1.0
</span><span class="cx"> self.sched = sched.scheduler(time.time, time.sleep)
</span><del>- self.client = DashboardClient(server)
</del><ins>+
+ self.servers = servers
+ self.current_server = 0
+ self.server_window = None
+
+ self.client = DashboardClient(servers[0])
</ins><span class="cx"> self.client_error = False
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -147,7 +133,6 @@
</span><span class="cx"> available window type.
</span><span class="cx"> """
</span><span class="cx"> cls.registered_windows[keypress] = wtype
</span><del>- cls.registered_order.append(keypress)
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -179,7 +164,7 @@
</span><span class="cx"> # Toggle a specific window on or off
</span><span class="cx"> if isinstance(wtype, type):
</span><span class="cx"> if wtype not in [type(w) for w in self.windows]:
</span><del>- self.windows.append(wtype(self.usesCurses, self.client).makeWindow())
</del><ins>+ self.windows.append(wtype(self.usesCurses, self).makeWindow())
</ins><span class="cx"> self.windows[-1].activate()
</span><span class="cx"> else:
</span><span class="cx"> for window in self.windows:
</span><span class="lines">@@ -198,25 +183,33 @@
</span><span class="cx"> window.deactivate()
</span><span class="cx"> self.windows = []
</span><span class="cx"> top = 0
</span><ins>+
+ if len(self.servers) > 1:
+ self.server_window = ServersMenu(self.usesCurses, self).makeWindow()
+ self.windows.append(self.server_window)
+ self.windows[-1].activate()
+ top += self.windows[-1].nlines + 1
+ help_top = top
+
</ins><span class="cx"> if wtype is None:
</span><span class="cx"> # All windows in registered order
</span><del>- ordered_windows = [self.registered_windows[i] for i in self.registered_order]
</del><ins>+ ordered_windows = self.registered_windows.values()
</ins><span class="cx"> else:
</span><span class="cx"> ordered_windows = list(wtype)
</span><span class="cx"> for wtype in filter(lambda x: x.all, ordered_windows):
</span><del>- new_win = wtype(self.usesCurses, self.client).makeWindow(top=top)
</del><ins>+ new_win = wtype(self.usesCurses, self).makeWindow(top=top)
</ins><span class="cx"> logging.debug('created %r at panel level %r' % (new_win, new_win.z_order))
</span><del>- self.windows.append(wtype(self.usesCurses, self.client).makeWindow(top=top))
</del><ins>+ self.windows.append(wtype(self.usesCurses, self).makeWindow(top=top))
</ins><span class="cx"> self.windows[-1].activate()
</span><span class="cx"> top += self.windows[-1].nlines + 1
</span><span class="cx">
</span><span class="cx"> # Don't display help panel if the window is too narrow
</span><span class="cx"> if self.usesCurses:
</span><span class="cx"> term_w, term_h = terminal_size()
</span><del>- logging.debug("logger displayWindow: rows: %s cols: %s" % (term_h, term_w))
</del><ins>+ logging.debug("HelpWindow: rows: %s cols: %s" % (term_h, term_w))
</ins><span class="cx"> if int(term_w) > 100:
</span><del>- logging.debug('term_w > 100, making window with top at %d' % (top))
- self.windows.append(HelpWindow(self.usesCurses, self.client).makeWindow(top=top))
</del><ins>+ logging.debug('HelpWindow: term_w > 100, making window with top at %d' % (top))
+ self.windows.append(HelpWindow(self.usesCurses, self).makeWindow(top=help_top))
</ins><span class="cx"> self.windows[-1].activate()
</span><span class="cx">
</span><span class="cx"> if self.usesCurses:
</span><span class="lines">@@ -237,7 +230,7 @@
</span><span class="cx"> top = 0
</span><span class="cx"> for old in old_windows:
</span><span class="cx"> logging.debug('processing window of type %r' % (type(old)))
</span><del>- self.windows.append(old.__class__(self.usesCurses, self.client).makeWindow(top=top))
</del><ins>+ self.windows.append(old.__class__(self.usesCurses, self).makeWindow(top=top))
</ins><span class="cx"> self.windows[-1].activate()
</span><span class="cx"> # Allow the help window to float on the right edge
</span><span class="cx"> if old.__class__.__name__ != "HelpWindow":
</span><span class="lines">@@ -271,34 +264,53 @@
</span><span class="cx">
</span><span class="cx"> # Check keystrokes
</span><span class="cx"> if self.usesCurses:
</span><del>- try:
- c = self.windows[-1].window.getkey()
- except:
- c = -1
- if c == "q":
- sys.exit(0)
- elif c == " ":
- self.paused = not self.paused
- elif c == "t":
- self.seconds = 1.0 if self.seconds == 0.1 else 0.1
- elif c == "a":
- self.displayWindow(None)
- elif c == "n":
- if self.windows:
- for window in self.windows:
- window.deactivate()
- self.windows = []
- self.displayWindow(self.registered_windows["h"])
- elif c in self.registered_windows:
- self.displayWindow(self.registered_windows[c])
- elif c in self.registered_window_sets:
- self.displayWindow(self.registered_window_sets[c][1])
</del><ins>+ self.processKeys()
</ins><span class="cx">
</span><span class="cx"> if not initialUpdate:
</span><span class="cx"> self.sched.enter(self.seconds, 0, self.updateDisplay, ())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def processKeys(self):
+ """
+ Check for a key press.
+ """
+ try:
+ self.windows[-1].window.keypad(1)
+ c = self.windows[-1].window.getkey()
+ except:
+ c = -1
+ if c == "q":
+ sys.exit(0)
+ elif c == " ":
+ self.paused = not self.paused
+ elif c == "t":
+ self.seconds = 1.0 if self.seconds == 0.1 else 0.1
+ elif c == "a":
+ self.displayWindow(None)
+ elif c == "n":
+ if self.windows:
+ for window in self.windows:
+ window.deactivate()
+ self.windows = []
+ self.displayWindow(self.registered_windows["h"])
</ins><span class="cx">
</span><ins>+ elif c in self.registered_windows:
+ self.displayWindow(self.registered_windows[c])
+
+ elif c in self.registered_window_sets:
+ self.displayWindow(self.registered_window_sets[c][1])
+
+ elif c in (curses.keyname(curses.KEY_LEFT), curses.keyname(curses.KEY_RIGHT)) and self.server_window:
+ self.current_server += (-1 if c == curses.keyname(curses.KEY_LEFT) else 1)
+ if self.current_server < 0:
+ self.current_server = 0
+ elif self.current_server >= len(self.servers):
+ self.current_server = len(self.servers) - 1
+ self.client = DashboardClient(self.servers[self.current_server])
+ self.resetWindows()
+
+
+
</ins><span class="cx"> class DashboardClient(object):
</span><span class="cx"> """
</span><span class="cx"> Client that connects to a server and fetches information.
</span><span class="lines">@@ -378,10 +390,30 @@
</span><span class="cx"> """
</span><span class="cx"> No need to monitor this item.
</span><span class="cx"> """
</span><del>- self.items.remove(item)
</del><ins>+ try:
+ self.items.remove(item)
+ except ValueError:
+ # Don't care if the item is not present
+ pass
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class Point(object):
+
+ def __init__(self, x=0, y=0):
+ self.x = x
+ self.y = y
+
+
+ def xplus(self, xdiff=1):
+ self.x += xdiff
+
+
+ def yplus(self, ydiff=1):
+ self.y += ydiff
+
+
+
</ins><span class="cx"> class BaseWindow(object):
</span><span class="cx"> """
</span><span class="cx"> Common behavior for window types.
</span><span class="lines">@@ -395,9 +427,9 @@
</span><span class="cx"> formatWidth = 0
</span><span class="cx"> additionalRows = 0
</span><span class="cx">
</span><del>- def __init__(self, usesCurses, client):
</del><ins>+ def __init__(self, usesCurses, dashboard):
</ins><span class="cx"> self.usesCurses = usesCurses
</span><del>- self.client = client
</del><ins>+ self.dashboard = dashboard
</ins><span class="cx"> self.rowCount = 0
</span><span class="cx"> self.needsReset = False
</span><span class="cx"> self.z_order = 'bottom'
</span><span class="lines">@@ -453,7 +485,7 @@
</span><span class="cx"> def requiresReset(self):
</span><span class="cx"> """
</span><span class="cx"> Indicates that the window needs a full reset, because e.g., the
</span><del>- number of items it didplays has changed.
</del><ins>+ number of items it displays has changed.
</ins><span class="cx"> """
</span><span class="cx"> return self.needsReset
</span><span class="cx">
</span><span class="lines">@@ -463,15 +495,20 @@
</span><span class="cx"> About to start displaying.
</span><span class="cx"> """
</span><span class="cx"> if self.clientItem:
</span><del>- self.client.addItem(self.clientItem)
</del><ins>+ self.dashboard.client.addItem(self.clientItem)
</ins><span class="cx">
</span><ins>+ # Update once when activated
+ if not self.requiresUpdate():
+ self.update()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def deactivate(self):
</span><span class="cx"> """
</span><span class="cx"> Clear any drawing done by the current window type.
</span><span class="cx"> """
</span><span class="cx"> if self.clientItem:
</span><del>- self.client.removeItem(self.clientItem)
</del><ins>+ self.dashboard.client.removeItem(self.clientItem)
+
</ins><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.erase()
</span><span class="cx"> self.window.refresh()
</span><span class="lines">@@ -484,411 +521,199 @@
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span><span class="cx">
</span><del>- def clientData(self):
- return self.client.currentData.get(self.clientItem)
-
-
- def readItem(self, item):
- return self.client.getOneItem(item)
-
-
-
-class HelpWindow(BaseWindow):
- """
- Display help for the dashboard.
- """
-
- help = "dashboard help"
- all = False
- helpItems = (
- "a - all windows",
- "n - no windows",
- " - (space) pause dashboard polling",
- "t - toggle update between 0.1 and 1.0 seconds",
- "",
- "q - exit the dashboard",
- )
-
- windowTitle = "Help"
- formatWidth = 48
- additionalRows = 3
-
- def makeWindow(self, top=0, left=0):
- term_w, _ignore_term_h = terminal_size()
- help_x_offset = term_w - self.formatWidth
- return super(HelpWindow, self).makeWindow(0, help_x_offset)
-
-
- def updateRowCount(self):
- self.rowCount = len(self.helpItems) + len(filter(lambda x: len(x[1]) != 0, Dashboard.registered_window_sets.values())) + len(Dashboard.registered_windows)
-
-
- def requiresUpdate(self):
- return False
-
-
- def update(self):
-
</del><ins>+ def tableHeader(self, hdrs, count):
+ """
+ Generate the header rows.
+ """
</ins><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.erase()
</span><span class="cx"> self.window.border()
</span><del>- self.window.addstr(0, 2, "Hotkeys")
</del><ins>+ self.window.addstr(
+ 0, 2,
+ self.title + " {} ({})".format(count, self.iter)
+ )
</ins><span class="cx">
</span><del>- x = 1
- y = 1
</del><ins>+ pt = Point(1, 1)
</ins><span class="cx">
</span><span class="cx"> if not self.usesCurses:
</span><span class="cx"> print("------------ {}".format(self.title))
</span><span class="cx">
</span><del>- items = []
- for keypress, wtype in sorted(
- Dashboard.registered_windows.items(), key=lambda x: x[0]
- ):
- items.append("{} - {}".format(keypress, wtype.help))
-
- items.append("")
- for key, value in Dashboard.registered_window_sets.items():
- description, panels = value
- if panels:
- items.append("{} - {}".format(key, description))
-
- items.extend(self.helpItems)
- for item in items:
</del><ins>+ for hdr in hdrs:
</ins><span class="cx"> if self.usesCurses:
</span><del>- self.window.addstr(y, x, item)
</del><ins>+ self.window.addstr(pt.y, pt.x, hdr, curses.A_REVERSE)
</ins><span class="cx"> else:
</span><del>- print(item)
- y += 1
</del><ins>+ print(hdr)
+ pt.yplus()
</ins><span class="cx">
</span><del>- if not self.usesCurses:
- print("")
</del><ins>+ return pt
</ins><span class="cx">
</span><ins>+
+ def tableFooter(self, feet, pt):
+ """
+ Generate the footer rows.
+ """
</ins><span class="cx"> if self.usesCurses:
</span><del>- self.window.refresh()
</del><ins>+ self.window.hline(pt.y, pt.x, "-", self.formatWidth - 2)
+ pt.yplus()
+ for footer in feet:
+ self.window.addstr(pt.y, pt.x, footer)
+ pt.yplus()
+ else:
+ for footer in feet:
+ print(footer)
+ pt.yplus()
+ print("")
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def tableRow(self, text, pt, style=curses.A_NORMAL):
+ """
+ Generate a single row.
+ """
+ try:
+ if self.usesCurses:
+ self.window.addstr(
+ pt.y, pt.x, text,
+ style
+ )
+ else:
+ print(text)
+ except curses.error:
+ pass
+ pt.yplus()
</ins><span class="cx">
</span><del>-class JobsWindow(BaseWindow):
- """
- Display the status of the server's job queue.
- """
</del><span class="cx">
</span><del>- help = "server jobs"
- clientItem = "jobs"
</del><ins>+ def clientData(self):
+ return self.dashboard.client.currentData.get(self.clientItem)
</ins><span class="cx">
</span><del>- windowTitle = "Jobs"
- formatWidth = 98
- additionalRows = 6
</del><span class="cx">
</span><del>- def updateRowCount(self):
- self.rowCount = defaultIfNone(self.readItem("jobcount"), 0)
</del><ins>+ def readItem(self, item):
+ return self.dashboard.client.getOneItem(item)
</ins><span class="cx">
</span><span class="cx">
</span><del>- def update(self):
- records = defaultIfNone(self.clientData(), {})
- if len(records) != self.rowCount:
- self.needsReset = True
- return
- self.iter += 1
</del><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
- self.window.addstr(
- 0, 2,
- self.title + " {} ({})".format(len(records), self.iter)
- )
</del><ins>+class ServersMenu(BaseWindow):
+ """
+ Top menu if multiple servers are present.
+ """
</ins><span class="cx">
</span><del>- x = 1
- y = 1
- s1 = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10} ".format(
- "Work Type", "Queued", "Assigned", "Late", "Failed", "Completed", "Av-Time",
- )
- s2 = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10} ".format(
- "", "", "", "", "", "", "(ms)",
- )
- if self.usesCurses:
- self.window.addstr(y, x, s1, curses.A_REVERSE)
- self.window.addstr(y + 1, x, s2, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s1)
- print(s2)
- y += 2
- total_queued = 0
- total_assigned = 0
- total_late = 0
- total_failed = 0
- total_completed = 0
- total_time = 0.0
- for work_type, details in sorted(records.items(), key=lambda x: x[0]):
- total_queued += details["queued"]
- total_assigned += details["assigned"]
- total_late += details["late"]
- total_failed += details["failed"]
- total_completed += details["completed"]
- total_time += details["time"]
- changed = (
- work_type in self.lastResult and
- self.lastResult[work_type]["queued"] != details["queued"]
- )
- s = "{}{:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10.1f} ".format(
- ">" if details["queued"] else " ",
- work_type,
- details["queued"],
- details["assigned"],
- details["late"],
- details["failed"],
- details["completed"],
- safeDivision(details["time"], details["completed"], 1000.0)
- )
- try:
- if self.usesCurses:
- self.window.addstr(
- y, x, s,
- curses.A_REVERSE if changed else (
- curses.A_BOLD if details["queued"] else curses.A_NORMAL
- )
- )
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ help = "servers help"
+ all = False
</ins><span class="cx">
</span><del>- s = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10.1f} ".format(
- "Total:",
- total_queued,
- total_assigned,
- total_late,
- total_failed,
- total_completed,
- safeDivision(total_time, total_completed, 1000.0)
- )
- if self.usesCurses:
- self.window.hline(y, x, "-", self.formatWidth - 2)
- y += 1
- self.window.addstr(y, x, s)
- else:
- print(s)
- print("")
- y += 1
</del><ins>+ windowTitle = "Servers"
+ formatWidth = 0
+ additionalRows = 0
</ins><span class="cx">
</span><del>- if self.usesCurses:
- self.window.refresh()
</del><ins>+ def makeWindow(self, top=0, left=0):
+ term_w, _ignore_term_h = terminal_size()
+ self.formatWidth = term_w - 50
+ return super(ServersMenu, self).makeWindow(0, 0)
</ins><span class="cx">
</span><del>- self.lastResult = records
</del><span class="cx">
</span><ins>+ def updateRowCount(self):
+ self.rowCount = 1
</ins><span class="cx">
</span><span class="cx">
</span><del>-class AssignmentsWindow(BaseWindow):
- """
- Displays the status of the server's master process worker slave slots.
- """
</del><ins>+ def requiresUpdate(self):
+ return False
</ins><span class="cx">
</span><del>- help = "server child job assignments"
- clientItem = "job_assignments"
</del><span class="cx">
</span><del>- windowTitle = "Job Assignments"
- formatWidth = 40
- additionalRows = 5
</del><ins>+ def update(self):
</ins><span class="cx">
</span><del>- def updateRowCount(self):
- self.rowCount = len(defaultIfNone(self.readItem(self.clientItem), {"workers": ()})["workers"])
</del><ins>+ if not self.usesCurses:
+ return
</ins><span class="cx">
</span><ins>+ self.window.erase()
</ins><span class="cx">
</span><del>- def update(self):
- data = defaultIfNone(self.clientData(), {"workers": {}, "level": 0})
- records = data["workers"]
- if len(records) != self.rowCount:
- self.needsReset = True
- return
- self.iter += 1
</del><ins>+ pt = Point()
+ s = "Servers: |"
+ self.window.addstr(pt.y, pt.x, s)
+ pt.xplus(len(s))
</ins><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
</del><ins>+ selected_server = None
+ for ctr, server in enumerate(self.dashboard.servers):
+ s = " {:02d} ".format(ctr + 1)
</ins><span class="cx"> self.window.addstr(
</span><del>- 0, 2,
- self.title + " {} ({})".format(len(records), self.iter)
</del><ins>+ pt.y, pt.x, s,
+ curses.A_REVERSE if ctr == self.dashboard.current_server else curses.A_NORMAL
</ins><span class="cx"> )
</span><ins>+ pt.xplus(len(s))
+ self.window.addstr(pt.y, pt.x, "|")
+ pt.xplus()
+ if ctr == self.dashboard.current_server:
+ selected_server = "{}:{}".format(*server)
</ins><span class="cx">
</span><del>- x = 1
- y = 1
- s = " {:>4}{:>12}{:>8}{:>12} ".format(
- "Slot", "assigned", "load", "completed"
- )
- if self.usesCurses:
- self.window.addstr(y, x, s, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s)
- y += 1
- total_assigned = 0
- total_completed = 0
- for ctr, details in enumerate(records):
- assigned, load, completed = details
- total_assigned += assigned
- total_completed += completed
- changed = (
- ctr in self.lastResult and
- self.lastResult[ctr] != assigned
- )
- s = " {:>4}{:>12}{:>8}{:>12} ".format(
- ctr,
- assigned,
- load,
- completed,
- )
- try:
- if self.usesCurses:
- self.window.addstr(
- y, x, s,
- curses.A_REVERSE if changed else curses.A_NORMAL
- )
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ self.window.addstr(pt.y, pt.x, " {}".format(selected_server))
</ins><span class="cx">
</span><del>- s = " {:<6}{:>10}{:>8}{:>12}".format(
- "Total:",
- total_assigned,
- "{}%".format(data["level"]),
- total_completed,
- )
- if self.usesCurses:
- self.window.hline(y, x, "-", self.formatWidth - 2)
- y += 1
- self.window.addstr(y, x, s)
- else:
- print(s)
- print("")
- y += 1
</del><ins>+ self.window.refresh()
</ins><span class="cx">
</span><del>- if self.usesCurses:
- self.window.refresh()
</del><span class="cx">
</span><del>- self.lastResult = records
</del><span class="cx">
</span><del>-
-
-class HTTPSlotsWindow(BaseWindow):
</del><ins>+class HelpWindow(BaseWindow):
</ins><span class="cx"> """
</span><del>- Displays the status of the server's master process worker slave slots.
</del><ins>+ Display help for the dashboard.
</ins><span class="cx"> """
</span><span class="cx">
</span><del>- help = "server child slots"
- clientItem = "slots"
</del><ins>+ help = "Help"
+ all = False
+ helpItems = (
+ " a - All Panels",
+ " n - No Panels",
+ "",
+ " - (space) Pause",
+ " t - Toggle Update Speed",
+ "",
+ " q - Quit",
+ )
</ins><span class="cx">
</span><del>- windowTitle = "HTTP Slots"
- formatWidth = 72
- additionalRows = 5
</del><ins>+ windowTitle = "Help"
+ formatWidth = 28
+ additionalRows = 3
</ins><span class="cx">
</span><ins>+ def makeWindow(self, top=0, left=0):
+ term_w, _ignore_term_h = terminal_size()
+ help_x_offset = term_w - self.formatWidth
+ return super(HelpWindow, self).makeWindow(0, help_x_offset)
+
+
</ins><span class="cx"> def updateRowCount(self):
</span><del>- self.rowCount = len(defaultIfNone(self.readItem(self.clientItem), {"slots": ()})["slots"])
</del><ins>+ self.rowCount = len(self.helpItems) + len(filter(lambda x: len(x[1]) != 0, Dashboard.registered_window_sets.values())) + len(Dashboard.registered_windows)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def requiresUpdate(self):
+ return False
+
+
</ins><span class="cx"> def update(self):
</span><del>- data = defaultIfNone(self.clientData(), {"slots": {}, "overloaded": False})
- records = data["slots"]
- if len(records) != self.rowCount:
- self.needsReset = True
- return
- self.iter += 1
</del><span class="cx">
</span><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.erase()
</span><span class="cx"> self.window.border()
</span><del>- self.window.addstr(
- 0, 2,
- self.title + " {} ({})".format(len(records), self.iter)
- )
</del><ins>+ self.window.addstr(0, 2, "Hotkeys")
</ins><span class="cx">
</span><del>- x = 1
- y = 1
- s = " {:>4}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8} ".format(
- "Slot", "unack", "ack", "uncls", "total",
- "start", "strting", "stopped", "abd"
- )
- if self.usesCurses:
- self.window.addstr(y, x, s, curses.A_REVERSE)
- else:
</del><ins>+ pt = Point(1, 1)
+
+ if not self.usesCurses:
</ins><span class="cx"> print("------------ {}".format(self.title))
</span><del>- print(s)
- y += 1
- for record in sorted(records, key=lambda x: x["slot"]):
- changed = (
- record["slot"] in self.lastResult and
- self.lastResult[record["slot"]] != record
- )
- s = " {:>4}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8} ".format(
- record["slot"],
- record["unacknowledged"],
- record["acknowledged"],
- record["unclosed"],
- record["total"],
- record["started"],
- record["starting"],
- record["stopped"],
- record["abandoned"],
- )
- try:
- count = record["unacknowledged"] + record["acknowledged"]
- if self.usesCurses:
- self.window.addstr(
- y, x, s,
- curses.A_REVERSE if changed else (
- curses.A_BOLD if count else curses.A_NORMAL
- )
- )
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><span class="cx">
</span><del>- s = " {:<12}{:>8}{:>16}".format(
- "Total:",
- sum(
- [
- record["unacknowledged"] + record["acknowledged"]
- for record in records
- ]
- ),
- sum([record["total"] for record in records]),
- )
- if self.usesCurses:
- self.window.hline(y, x, "-", self.formatWidth - 2)
- y += 1
- self.window.addstr(y, x, s)
- x += len(s) + 4
- s = "{:>10}".format("OVERLOADED" if data["overloaded"] else "")
- self.window.addstr(
- y, x, s,
- curses.color_pair(1) + curses.A_BOLD if data["overloaded"] else curses.A_NORMAL
- )
- else:
- if data["overloaded"]:
- s += " OVERLOADED"
- print(s)
- print("")
- y += 1
</del><ins>+ items = [" {} - {}".format(keypress, wtype.help) for keypress, wtype in Dashboard.registered_windows.items()]
+ items.append("")
+ items.extend([" {} - {}".format(key, value[0]) for key, value in Dashboard.registered_window_sets.items() if value[1]])
+ items.extend(self.helpItems)
</ins><span class="cx">
</span><ins>+ for item in items:
+ self.tableRow(item, pt)
+
</ins><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.refresh()
</span><span class="cx">
</span><del>- self.lastResult = records
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class SystemWindow(BaseWindow):
</span><span class="cx"> """
</span><span class="cx"> Displays the system information provided by the server.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- help = "system details"
</del><ins>+ help = "System Status"
</ins><span class="cx"> clientItem = "stats_system"
</span><span class="cx">
</span><span class="cx"> windowTitle = "System"
</span><span class="lines">@@ -911,23 +736,8 @@
</span><span class="cx"> return
</span><span class="cx"> self.iter += 1
</span><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
- self.window.addstr(
- 0, 2,
- self.title + " {} ({})".format(len(records), self.iter)
- )
-
- x = 1
- y = 1
</del><span class="cx"> s = " {:<30}{:>18} ".format("Item", "Value")
</span><del>- if self.usesCurses:
- self.window.addstr(y, x, s, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s)
- y += 1
</del><ins>+ pt = self.tableHeader((s,), len(records))
</ins><span class="cx">
</span><span class="cx"> records["cpu use"] = "{:.2f}".format(records["cpu use"])
</span><span class="cx"> records["memory percent"] = "{:.1f}".format(records["memory percent"])
</span><span class="lines">@@ -944,21 +754,11 @@
</span><span class="cx"> item in self.lastResult and self.lastResult[item] != value
</span><span class="cx"> )
</span><span class="cx"> s = " {:<30}{:>18} ".format(item, value)
</span><del>- try:
- if self.usesCurses:
- self.window.addstr(
- y, x, s,
- curses.A_REVERSE if changed else curses.A_NORMAL
- )
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ self.tableRow(
+ s, pt,
+ curses.A_REVERSE if changed else curses.A_NORMAL,
+ )
</ins><span class="cx">
</span><del>- if not self.usesCurses:
- print("")
-
</del><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.refresh()
</span><span class="cx">
</span><span class="lines">@@ -971,7 +771,7 @@
</span><span class="cx"> Displays the status of the server's master process worker slave slots.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- help = "server request stats"
</del><ins>+ help = "HTTP Requests"
</ins><span class="cx"> clientItem = "stats"
</span><span class="cx">
</span><span class="cx"> windowTitle = "Request Statistics"
</span><span class="lines">@@ -986,27 +786,14 @@
</span><span class="cx"> records = defaultIfNone(self.clientData(), {})
</span><span class="cx"> self.iter += 1
</span><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
- self.window.addstr(0, 2, self.title + " {} ({})".format(len(records), self.iter,))
-
- x = 1
- y = 1
</del><span class="cx"> s1 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
</span><span class="cx"> "Period", "Reqs", "Av-Reqs", "Av-Resp", "Av-NoWr", "Max-Resp", "Slot", "CPU ", "500's"
</span><span class="cx"> )
</span><span class="cx"> s2 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
</span><span class="cx"> "", "", "per sec", "(ms)", "(ms)", "(ms)", "Avg.", "Avg.", ""
</span><span class="cx"> )
</span><del>- if self.usesCurses:
- self.window.addstr(y, x, s1, curses.A_REVERSE)
- self.window.addstr(y + 1, x, s2, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s1)
- print(s2)
- y += 2
</del><ins>+ pt = self.tableHeader((s1, s2,), len(records))
+
</ins><span class="cx"> for key, seconds in (("current", 60,), ("1m", 60,), ("5m", 5 * 60,), ("1h", 60 * 60,),):
</span><span class="cx"> stat = records.get(key, {
</span><span class="cx"> "requests": 0,
</span><span class="lines">@@ -1028,18 +815,83 @@
</span><span class="cx"> safeDivision(stat["cpu"], stat["requests"]),
</span><span class="cx"> stat["500"],
</span><span class="cx"> )
</span><del>- try:
- if self.usesCurses:
- self.window.addstr(y, x, s)
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ self.tableRow(s, pt)
</ins><span class="cx">
</span><del>- if not self.usesCurses:
- print("")
</del><ins>+ if self.usesCurses:
+ self.window.refresh()
</ins><span class="cx">
</span><ins>+ self.lastResult = records
+
+
+
+class HTTPSlotsWindow(BaseWindow):
+ """
+ Displays the status of the server's master process worker slave slots.
+ """
+
+ help = "HTTP Slots"
+ clientItem = "slots"
+
+ windowTitle = "HTTP Slots"
+ formatWidth = 72
+ additionalRows = 5
+
+ def updateRowCount(self):
+ self.rowCount = len(defaultIfNone(self.readItem(self.clientItem), {"slots": ()})["slots"])
+
+
+ def update(self):
+ data = defaultIfNone(self.clientData(), {"slots": {}, "overloaded": False})
+ records = data["slots"]
+ if len(records) != self.rowCount:
+ self.needsReset = True
+ return
+ self.iter += 1
+
+ s = " {:>4}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8} ".format(
+ "Slot", "unack", "ack", "uncls", "total",
+ "start", "strting", "stopped", "abd"
+ )
+ pt = self.tableHeader((s,), len(records))
+
+ for record in sorted(records, key=lambda x: x["slot"]):
+ changed = (
+ record["slot"] in self.lastResult and
+ self.lastResult[record["slot"]] != record
+ )
+ s = " {:>4}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8}{:>8} ".format(
+ record["slot"],
+ record["unacknowledged"],
+ record["acknowledged"],
+ record["unclosed"],
+ record["total"],
+ record["started"],
+ record["starting"],
+ record["stopped"],
+ record["abandoned"],
+ )
+ count = record["unacknowledged"] + record["acknowledged"]
+ self.tableRow(
+ s, pt,
+ curses.A_REVERSE if changed else (
+ curses.A_BOLD if count else curses.A_NORMAL
+ ),
+ )
+
+ s = " {:<12}{:>8}{:>16}".format(
+ "Total:",
+ sum(
+ [
+ record["unacknowledged"] + record["acknowledged"]
+ for record in records
+ ]
+ ),
+ sum([record["total"] for record in records]),
+ )
+ if data["overloaded"]:
+ s += " OVERLOADED"
+ self.tableFooter((s,), pt)
+
</ins><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.refresh()
</span><span class="cx">
</span><span class="lines">@@ -1052,13 +904,13 @@
</span><span class="cx"> Display the status of the server's request methods.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- help = "server methods"
</del><ins>+ help = "HTTP Methods"
</ins><span class="cx"> clientItem = "stats"
</span><span class="cx"> stats_keys = ("current", "1m", "5m", "1h",)
</span><span class="cx">
</span><span class="cx"> windowTitle = "Methods"
</span><span class="cx"> formatWidth = 116
</span><del>- additionalRows = 7
</del><ins>+ additionalRows = 8
</ins><span class="cx">
</span><span class="cx"> def updateRowCount(self):
</span><span class="cx"> stats = defaultIfNone(self.clientData(), {})
</span><span class="lines">@@ -1074,6 +926,9 @@
</span><span class="cx"> methods = set()
</span><span class="cx"> for key in self.stats_keys:
</span><span class="cx"> methods.update(stats.get(key, {}).get("method", {}).keys())
</span><ins>+ if len(methods) != self.rowCount:
+ self.needsReset = True
+ return
</ins><span class="cx">
</span><span class="cx"> records = {}
</span><span class="cx"> records_t = {}
</span><span class="lines">@@ -1082,16 +937,6 @@
</span><span class="cx"> records_t[key] = defaultIfNone(self.clientData(), {}).get(key, {}).get("method-t", {})
</span><span class="cx"> self.iter += 1
</span><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
- self.window.addstr(
- 0, 2,
- self.title + " {} ({})".format(len(records), self.iter)
- )
-
- x = 1
- y = 1
</del><span class="cx"> s1 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
</span><span class="cx"> "", "------", "current---", "------", "1m--------", "------", "5m--------", "------", "1h--------",
</span><span class="cx"> )
</span><span class="lines">@@ -1101,16 +946,8 @@
</span><span class="cx"> s3 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
</span><span class="cx"> "", "", "(ms)", "", "(ms)", "", "(ms)", "", "(ms)",
</span><span class="cx"> )
</span><del>- if self.usesCurses:
- self.window.addstr(y, x, s1, curses.A_REVERSE)
- self.window.addstr(y + 1, x, s2, curses.A_REVERSE)
- self.window.addstr(y + 2, x, s3, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s1)
- print(s2)
- print(s3)
- y += 2
</del><ins>+ pt = self.tableHeader((s1, s2, s3,), len(records))
+
</ins><span class="cx"> total_methods = dict([(key, 0) for key in self.stats_keys])
</span><span class="cx"> total_time = dict([(key, 0.0) for key in self.stats_keys])
</span><span class="cx"> for method_type in sorted(methods):
</span><span class="lines">@@ -1125,17 +962,10 @@
</span><span class="cx"> s = " {:<40}{:>8}{:>10.1f}{:>8}{:>10.1f}{:>8}{:>10.1f}{:>8}{:>10.1f} ".format(
</span><span class="cx"> *items
</span><span class="cx"> )
</span><del>- try:
- if self.usesCurses:
- self.window.addstr(
- y, x, s,
- curses.A_REVERSE if changed else curses.A_NORMAL,
- )
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ self.tableRow(
+ s, pt,
+ curses.A_REVERSE if changed else curses.A_NORMAL,
+ )
</ins><span class="cx">
</span><span class="cx"> items = ["Total:"]
</span><span class="cx"> for key in self.stats_keys:
</span><span class="lines">@@ -1151,17 +981,7 @@
</span><span class="cx"> s2 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
</span><span class="cx"> *items
</span><span class="cx"> )
</span><del>- if self.usesCurses:
- self.window.hline(y, x, "-", self.formatWidth - 2)
- y += 1
- self.window.addstr(y, x, s1)
- y += 1
- self.window.addstr(y, x, s2)
- else:
- print(s1)
- print(s2)
- print("")
- y += 1
</del><ins>+ self.tableFooter((s1, s2,), pt)
</ins><span class="cx">
</span><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.refresh()
</span><span class="lines">@@ -1170,12 +990,160 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class AssignmentsWindow(BaseWindow):
+ """
+ Displays the status of the server's master process worker slave slots.
+ """
+
+ help = "Job Assignments"
+ clientItem = "job_assignments"
+
+ windowTitle = "Job Assignments"
+ formatWidth = 40
+ additionalRows = 5
+
+ def updateRowCount(self):
+ self.rowCount = len(defaultIfNone(self.readItem(self.clientItem), {"workers": ()})["workers"])
+
+
+ def update(self):
+ data = defaultIfNone(self.clientData(), {"workers": {}, "level": 0})
+ records = data["workers"]
+ if len(records) != self.rowCount:
+ self.needsReset = True
+ return
+ self.iter += 1
+
+ s = " {:>4}{:>12}{:>8}{:>12} ".format(
+ "Slot", "assigned", "load", "completed"
+ )
+ pt = self.tableHeader((s,), len(records))
+
+ total_assigned = 0
+ total_completed = 0
+ for ctr, details in enumerate(records):
+ assigned, load, completed = details
+ total_assigned += assigned
+ total_completed += completed
+ changed = (
+ ctr in self.lastResult and
+ self.lastResult[ctr] != assigned
+ )
+ s = " {:>4}{:>12}{:>8}{:>12} ".format(
+ ctr,
+ assigned,
+ load,
+ completed,
+ )
+ self.tableRow(
+ s, pt,
+ curses.A_REVERSE if changed else curses.A_NORMAL,
+ )
+
+ s = " {:<6}{:>10}{:>8}{:>12}".format(
+ "Total:",
+ total_assigned,
+ "{}%".format(data["level"]),
+ total_completed,
+ )
+ self.tableFooter((s,), pt)
+
+ if self.usesCurses:
+ self.window.refresh()
+
+ self.lastResult = records
+
+
+
+class JobsWindow(BaseWindow):
+ """
+ Display the status of the server's job queue.
+ """
+
+ help = "Job Activity"
+ clientItem = "jobs"
+
+ windowTitle = "Jobs"
+ formatWidth = 98
+ additionalRows = 6
+
+ def updateRowCount(self):
+ self.rowCount = defaultIfNone(self.readItem("jobcount"), 0)
+
+
+ def update(self):
+ records = defaultIfNone(self.clientData(), {})
+ if len(records) != self.rowCount:
+ self.needsReset = True
+ return
+ self.iter += 1
+
+ s1 = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10} ".format(
+ "Work Type", "Queued", "Assigned", "Late", "Failed", "Completed", "Av-Time",
+ )
+ s2 = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10} ".format(
+ "", "", "", "", "", "", "(ms)",
+ )
+ pt = self.tableHeader((s1, s2,), len(records))
+
+ total_queued = 0
+ total_assigned = 0
+ total_late = 0
+ total_failed = 0
+ total_completed = 0
+ total_time = 0.0
+ for work_type, details in sorted(records.items(), key=lambda x: x[0]):
+ total_queued += details["queued"]
+ total_assigned += details["assigned"]
+ total_late += details["late"]
+ total_failed += details["failed"]
+ total_completed += details["completed"]
+ total_time += details["time"]
+ changed = (
+ work_type in self.lastResult and
+ self.lastResult[work_type]["queued"] != details["queued"]
+ )
+ s = "{}{:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10.1f} ".format(
+ ">" if details["queued"] else " ",
+ work_type,
+ details["queued"],
+ details["assigned"],
+ details["late"],
+ details["failed"],
+ details["completed"],
+ safeDivision(details["time"], details["completed"], 1000.0)
+ )
+ self.tableRow(
+ s, pt,
+ curses.A_REVERSE if changed else (
+ curses.A_BOLD if details["queued"] else curses.A_NORMAL
+ ),
+ )
+
+ s = " {:<40}{:>8}{:>10}{:>8}{:>8}{:>10}{:>10.1f} ".format(
+ "Total:",
+ total_queued,
+ total_assigned,
+ total_late,
+ total_failed,
+ total_completed,
+ safeDivision(total_time, total_completed, 1000.0)
+ )
+ self.tableFooter((s,), pt)
+
+ if self.usesCurses:
+ self.window.refresh()
+
+ self.lastResult = records
+
+
+
</ins><span class="cx"> class DirectoryStatsWindow(BaseWindow):
</span><span class="cx"> """
</span><span class="cx"> Displays the status of the server's directory service calls
</span><span class="cx"> """
</span><span class="cx">
</span><del>- help = "directory service stats"
</del><ins>+ help = "Directory Service"
</ins><span class="cx"> clientItem = "directory"
</span><span class="cx">
</span><span class="cx"> windowTitle = "Directory Service"
</span><span class="lines">@@ -1194,27 +1162,13 @@
</span><span class="cx">
</span><span class="cx"> self.iter += 1
</span><span class="cx">
</span><del>- if self.usesCurses:
- self.window.erase()
- self.window.border()
- self.window.addstr(0, 2, self.title + " {} ({})".format(len(records), self.iter,))
-
- x = 1
- y = 1
</del><span class="cx"> s1 = " {:<40}{:>15}{:>15}{:>15} ".format(
</span><span class="cx"> "Method", "Calls", "Total", "Average"
</span><span class="cx"> )
</span><span class="cx"> s2 = " {:<40}{:>15}{:>15}{:>15} ".format(
</span><span class="cx"> "", "", "(sec)", "(ms)"
</span><span class="cx"> )
</span><del>- if self.usesCurses:
- self.window.addstr(y, x, s1, curses.A_REVERSE)
- self.window.addstr(y + 1, x, s2, curses.A_REVERSE)
- else:
- print("------------ {}".format(self.title))
- print(s1)
- print(s2)
- y += 2
</del><ins>+ pt = self.tableHeader((s1, s2,), len(records))
</ins><span class="cx">
</span><span class="cx"> overallCount = 0
</span><span class="cx"> overallCountRatio = 0
</span><span class="lines">@@ -1242,14 +1196,7 @@
</span><span class="cx"> timeSpent,
</span><span class="cx"> (1000.0 * timeSpent) / count,
</span><span class="cx"> )
</span><del>- try:
- if self.usesCurses:
- self.window.addstr(y, x, s)
- else:
- print(s)
- except curses.error:
- pass
- y += 1
</del><ins>+ self.tableRow(s, pt)
</ins><span class="cx">
</span><span class="cx"> s = " {:<40}{:>15d}{:>15.1f}{:>15.3f} ".format(
</span><span class="cx"> "Total:",
</span><span class="lines">@@ -1269,18 +1216,7 @@
</span><span class="cx"> safeDivision(overallCountUncached, overallCountRatio, 100.0),
</span><span class="cx"> "",
</span><span class="cx"> )
</span><del>- if self.usesCurses:
- self.window.hline(y, x, "-", self.formatWidth - 2)
- y += 1
- self.window.addstr(y, x, s)
- self.window.addstr(y + 1, x, s_cached)
- self.window.addstr(y + 2, x, s_uncached)
- else:
- print(s)
- print(s1)
- print(s2)
- print("")
- y += 3
</del><ins>+ self.tableFooter((s, s_cached, s_uncached), pt)
</ins><span class="cx">
</span><span class="cx"> if self.usesCurses:
</span><span class="cx"> self.window.refresh()
</span></span></pre>
</div>
</div>
</body>
</html>