[CalendarServer-changes] [15373] CalendarServer/trunk/calendarserver/tools/dashboard.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Dec 9 09:49:04 PST 2015


Revision: 15373
          http://trac.calendarserver.org//changeset/15373
Author:   cdaboo at apple.com
Date:     2015-12-09 09:49:04 -0800 (Wed, 09 Dec 2015)
Log Message:
-----------
Support viewing multiple servers (one at a time). Code refactor to simplify each panel.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/dashboard.py

Modified: CalendarServer/trunk/calendarserver/tools/dashboard.py
===================================================================
--- 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)
@@ -20,12 +20,12 @@
 """
 
 import argparse
+import collections
 import curses.panel
 import errno
 import fcntl
 import json
 import logging
-import os
 import sched
 import socket
 import struct
@@ -34,60 +34,42 @@
 import time
 
 LOG_FILENAME = 'db.log'
-# logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
+#logging.basicConfig(filename=LOG_FILENAME, level=logging.DEBUG)
 
 
 
-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)
-
-
-
 def main():
     parser = argparse.ArgumentParser(description="Dashboard service for CalendarServer.")
     parser.add_argument("-t", action="store_false", help="text output, not curses")
-    parser.add_argument("-s", default="localhost:8100", help="server host (and optional port), or unix socket path prefixed by 'unix:'")
+    parser.add_argument("-s", nargs="*", default=["localhost:8100"], help="server host (and optional port), or unix socket path prefixed by 'unix:'")
     args = parser.parse_args()
 
     #
     # Get configuration
     #
     useCurses = args.t
-    if not args.s.startswith("unix:"):
-        server = args.s.split(":")
-        if len(server) == 1:
-            server.append(8100)
+    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))
         else:
-            server[1] = int(server[1])
-        server = tuple(server)
-    else:
-        server = args.s
+            servers.append(server)
 
     if useCurses:
         def _wrapped(stdscrn):
             curses.curs_set(0)
             curses.use_default_colors()
             curses.init_pair(1, curses.COLOR_RED, curses.COLOR_WHITE)
-            d = Dashboard(server, stdscrn, True)
+            d = Dashboard(servers, stdscrn, True)
             d.run()
         curses.wrapper(_wrapped)
     else:
-        d = Dashboard(server, None, False)
+        d = Dashboard(servers, None, False)
         d.run()
 
 
@@ -121,20 +103,24 @@
     """
 
     screen = None
-    registered_windows = {}
+    registered_windows = collections.OrderedDict()
     registered_window_sets = {
         "H": ("HTTP Panels", [],),
         "J": ("Jobs Panels", [],),
     }
-    registered_order = []
 
-    def __init__(self, server, screen, usesCurses):
+    def __init__(self, servers, screen, usesCurses):
         self.screen = screen
         self.usesCurses = usesCurses
         self.paused = False
         self.seconds = 0.1 if usesCurses else 1.0
         self.sched = sched.scheduler(time.time, time.sleep)
-        self.client = DashboardClient(server)
+
+        self.servers = servers
+        self.current_server = 0
+        self.server_window = None
+
+        self.client = DashboardClient(servers[0])
         self.client_error = False
 
 
@@ -147,7 +133,6 @@
         available window type.
         """
         cls.registered_windows[keypress] = wtype
-        cls.registered_order.append(keypress)
 
 
     @classmethod
@@ -179,7 +164,7 @@
         # Toggle a specific window on or off
         if isinstance(wtype, type):
             if wtype not in [type(w) for w in self.windows]:
-                self.windows.append(wtype(self.usesCurses, self.client).makeWindow())
+                self.windows.append(wtype(self.usesCurses, self).makeWindow())
                 self.windows[-1].activate()
             else:
                 for window in self.windows:
@@ -198,25 +183,33 @@
                     window.deactivate()
                 self.windows = []
             top = 0
+
+            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
+
             if wtype is None:
                 # All windows in registered order
-                ordered_windows = [self.registered_windows[i] for i in self.registered_order]
+                ordered_windows = self.registered_windows.values()
             else:
                 ordered_windows = list(wtype)
             for wtype in filter(lambda x: x.all, ordered_windows):
-                new_win = wtype(self.usesCurses, self.client).makeWindow(top=top)
+                new_win = wtype(self.usesCurses, self).makeWindow(top=top)
                 logging.debug('created %r at panel level %r' % (new_win, new_win.z_order))
-                self.windows.append(wtype(self.usesCurses, self.client).makeWindow(top=top))
+                self.windows.append(wtype(self.usesCurses, self).makeWindow(top=top))
                 self.windows[-1].activate()
                 top += self.windows[-1].nlines + 1
 
             # Don't display help panel if the window is too narrow
             if self.usesCurses:
                 term_w, term_h = terminal_size()
-                logging.debug("logger displayWindow: rows: %s  cols: %s" % (term_h, term_w))
+                logging.debug("HelpWindow: rows: %s  cols: %s" % (term_h, term_w))
                 if int(term_w) > 100:
-                    logging.debug('term_w > 100, making window with top at %d' % (top))
-                    self.windows.append(HelpWindow(self.usesCurses, self.client).makeWindow(top=top))
+                    logging.debug('HelpWindow: term_w > 100, making window with top at %d' % (top))
+                    self.windows.append(HelpWindow(self.usesCurses, self).makeWindow(top=help_top))
                     self.windows[-1].activate()
 
         if self.usesCurses:
@@ -237,7 +230,7 @@
             top = 0
             for old in old_windows:
                 logging.debug('processing window of type %r' % (type(old)))
-                self.windows.append(old.__class__(self.usesCurses, self.client).makeWindow(top=top))
+                self.windows.append(old.__class__(self.usesCurses, self).makeWindow(top=top))
                 self.windows[-1].activate()
                 # Allow the help window to float on the right edge
                 if old.__class__.__name__ != "HelpWindow":
@@ -271,34 +264,53 @@
 
         # Check keystrokes
         if self.usesCurses:
-            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])
+            self.processKeys()
 
         if not initialUpdate:
             self.sched.enter(self.seconds, 0, self.updateDisplay, ())
 
 
+    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"])
 
+        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()
+
+
+
 class DashboardClient(object):
     """
     Client that connects to a server and fetches information.
@@ -378,10 +390,30 @@
         """
         No need to monitor this item.
         """
-        self.items.remove(item)
+        try:
+            self.items.remove(item)
+        except ValueError:
+            # Don't care if the item is not present
+            pass
 
 
 
+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
+
+
+
 class BaseWindow(object):
     """
     Common behavior for window types.
@@ -395,9 +427,9 @@
     formatWidth = 0
     additionalRows = 0
 
-    def __init__(self, usesCurses, client):
+    def __init__(self, usesCurses, dashboard):
         self.usesCurses = usesCurses
-        self.client = client
+        self.dashboard = dashboard
         self.rowCount = 0
         self.needsReset = False
         self.z_order = 'bottom'
@@ -453,7 +485,7 @@
     def requiresReset(self):
         """
         Indicates that the window needs a full reset, because e.g., the
-        number of items it didplays has changed.
+        number of items it displays has changed.
         """
         return self.needsReset
 
@@ -463,15 +495,20 @@
         About to start displaying.
         """
         if self.clientItem:
-            self.client.addItem(self.clientItem)
+            self.dashboard.client.addItem(self.clientItem)
 
+        # Update once when activated
+        if not self.requiresUpdate():
+            self.update()
 
+
     def deactivate(self):
         """
         Clear any drawing done by the current window type.
         """
         if self.clientItem:
-            self.client.removeItem(self.clientItem)
+            self.dashboard.client.removeItem(self.clientItem)
+
         if self.usesCurses:
             self.window.erase()
             self.window.refresh()
@@ -484,411 +521,199 @@
         raise NotImplementedError()
 
 
-    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):
-
+    def tableHeader(self, hdrs, count):
+        """
+        Generate the header rows.
+        """
         if self.usesCurses:
             self.window.erase()
             self.window.border()
-            self.window.addstr(0, 2, "Hotkeys")
+            self.window.addstr(
+                0, 2,
+                self.title + " {} ({})".format(count, self.iter)
+            )
 
-        x = 1
-        y = 1
+        pt = Point(1, 1)
 
         if not self.usesCurses:
             print("------------ {}".format(self.title))
 
-        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:
+        for hdr in hdrs:
             if self.usesCurses:
-                self.window.addstr(y, x, item)
+                self.window.addstr(pt.y, pt.x, hdr, curses.A_REVERSE)
             else:
-                print(item)
-            y += 1
+                print(hdr)
+            pt.yplus()
 
-        if not self.usesCurses:
-            print("")
+        return pt
 
+
+    def tableFooter(self, feet, pt):
+        """
+        Generate the footer rows.
+        """
         if self.usesCurses:
-            self.window.refresh()
+            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("")
 
 
+    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()
 
-class JobsWindow(BaseWindow):
-    """
-    Display the status of the server's job queue.
-    """
 
-    help = "server jobs"
-    clientItem = "jobs"
+    def clientData(self):
+        return self.dashboard.client.currentData.get(self.clientItem)
 
-    windowTitle = "Jobs"
-    formatWidth = 98
-    additionalRows = 6
 
-    def updateRowCount(self):
-        self.rowCount = defaultIfNone(self.readItem("jobcount"), 0)
+    def readItem(self, item):
+        return self.dashboard.client.getOneItem(item)
 
 
-    def update(self):
-        records = defaultIfNone(self.clientData(), {})
-        if len(records) != self.rowCount:
-            self.needsReset = True
-            return
-        self.iter += 1
 
-        if self.usesCurses:
-            self.window.erase()
-            self.window.border()
-            self.window.addstr(
-                0, 2,
-                self.title + " {} ({})".format(len(records), self.iter)
-            )
+class ServersMenu(BaseWindow):
+    """
+    Top menu if multiple servers are present.
+    """
 
-        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
+    help = "servers help"
+    all = False
 
-        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
+    windowTitle = "Servers"
+    formatWidth = 0
+    additionalRows = 0
 
-        if self.usesCurses:
-            self.window.refresh()
+    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)
 
-        self.lastResult = records
 
+    def updateRowCount(self):
+        self.rowCount = 1
 
 
-class AssignmentsWindow(BaseWindow):
-    """
-    Displays the status of the server's master process worker slave slots.
-    """
+    def requiresUpdate(self):
+        return False
 
-    help = "server child job assignments"
-    clientItem = "job_assignments"
 
-    windowTitle = "Job Assignments"
-    formatWidth = 40
-    additionalRows = 5
+    def update(self):
 
-    def updateRowCount(self):
-        self.rowCount = len(defaultIfNone(self.readItem(self.clientItem), {"workers": ()})["workers"])
+        if not self.usesCurses:
+            return
 
+        self.window.erase()
 
-    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
+        pt = Point()
+        s = "Servers: |"
+        self.window.addstr(pt.y, pt.x, s)
+        pt.xplus(len(s))
 
-        if self.usesCurses:
-            self.window.erase()
-            self.window.border()
+        selected_server = None
+        for ctr, server in enumerate(self.dashboard.servers):
+            s = " {:02d} ".format(ctr + 1)
             self.window.addstr(
-                0, 2,
-                self.title + " {} ({})".format(len(records), self.iter)
+                pt.y, pt.x, s,
+                curses.A_REVERSE if ctr == self.dashboard.current_server else curses.A_NORMAL
             )
+            pt.xplus(len(s))
+            self.window.addstr(pt.y, pt.x, "|")
+            pt.xplus()
+            if ctr == self.dashboard.current_server:
+                selected_server = "{}:{}".format(*server)
 
-        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
+        self.window.addstr(pt.y, pt.x, " {}".format(selected_server))
 
-        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
+        self.window.refresh()
 
-        if self.usesCurses:
-            self.window.refresh()
 
-        self.lastResult = records
 
-
-
-class HTTPSlotsWindow(BaseWindow):
+class HelpWindow(BaseWindow):
     """
-    Displays the status of the server's master process worker slave slots.
+    Display help for the dashboard.
     """
 
-    help = "server child slots"
-    clientItem = "slots"
+    help = "Help"
+    all = False
+    helpItems = (
+        " a - All Panels",
+        " n - No Panels",
+        "",
+        "   - (space) Pause",
+        " t - Toggle Update Speed",
+        "",
+        " q - Quit",
+    )
 
-    windowTitle = "HTTP Slots"
-    formatWidth = 72
-    additionalRows = 5
+    windowTitle = "Help"
+    formatWidth = 28
+    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(defaultIfNone(self.readItem(self.clientItem), {"slots": ()})["slots"])
+        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):
-        data = defaultIfNone(self.clientData(), {"slots": {}, "overloaded": False})
-        records = data["slots"]
-        if len(records) != self.rowCount:
-            self.needsReset = True
-            return
-        self.iter += 1
 
         if self.usesCurses:
             self.window.erase()
             self.window.border()
-            self.window.addstr(
-                0, 2,
-                self.title + " {} ({})".format(len(records), self.iter)
-            )
+            self.window.addstr(0, 2, "Hotkeys")
 
-        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:
+        pt = Point(1, 1)
+
+        if not self.usesCurses:
             print("------------ {}".format(self.title))
-            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
 
-        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
+        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)
 
+        for item in items:
+            self.tableRow(item, pt)
+
         if self.usesCurses:
             self.window.refresh()
 
-        self.lastResult = records
 
 
-
 class SystemWindow(BaseWindow):
     """
     Displays the system information provided by the server.
     """
 
-    help = "system details"
+    help = "System Status"
     clientItem = "stats_system"
 
     windowTitle = "System"
@@ -911,23 +736,8 @@
             return
         self.iter += 1
 
-        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
         s = " {:<30}{:>18} ".format("Item", "Value")
-        if self.usesCurses:
-            self.window.addstr(y, x, s, curses.A_REVERSE)
-        else:
-            print("------------ {}".format(self.title))
-            print(s)
-        y += 1
+        pt = self.tableHeader((s,), len(records))
 
         records["cpu use"] = "{:.2f}".format(records["cpu use"])
         records["memory percent"] = "{:.1f}".format(records["memory percent"])
@@ -944,21 +754,11 @@
                 item in self.lastResult and self.lastResult[item] != value
             )
             s = " {:<30}{:>18} ".format(item, value)
-            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
+            self.tableRow(
+                s, pt,
+                curses.A_REVERSE if changed else curses.A_NORMAL,
+            )
 
-        if not self.usesCurses:
-            print("")
-
         if self.usesCurses:
             self.window.refresh()
 
@@ -971,7 +771,7 @@
     Displays the status of the server's master process worker slave slots.
     """
 
-    help = "server request stats"
+    help = "HTTP Requests"
     clientItem = "stats"
 
     windowTitle = "Request Statistics"
@@ -986,27 +786,14 @@
         records = defaultIfNone(self.clientData(), {})
         self.iter += 1
 
-        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
         s1 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
             "Period", "Reqs", "Av-Reqs", "Av-Resp", "Av-NoWr", "Max-Resp", "Slot", "CPU ", "500's"
         )
         s2 = " {:<8}{:>8}{:>10}{:>10}{:>10}{:>10}{:>8}{:>8}{:>8} ".format(
             "", "", "per sec", "(ms)", "(ms)", "(ms)", "Avg.", "Avg.", ""
         )
-        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
+        pt = self.tableHeader((s1, s2,), len(records))
+
         for key, seconds in (("current", 60,), ("1m", 60,), ("5m", 5 * 60,), ("1h", 60 * 60,),):
             stat = records.get(key, {
                 "requests": 0,
@@ -1028,18 +815,83 @@
                 safeDivision(stat["cpu"], stat["requests"]),
                 stat["500"],
             )
-            try:
-                if self.usesCurses:
-                    self.window.addstr(y, x, s)
-                else:
-                    print(s)
-            except curses.error:
-                pass
-            y += 1
+            self.tableRow(s, pt)
 
-        if not self.usesCurses:
-            print("")
+        if self.usesCurses:
+            self.window.refresh()
 
+        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)
+
         if self.usesCurses:
             self.window.refresh()
 
@@ -1052,13 +904,13 @@
     Display the status of the server's request methods.
     """
 
-    help = "server methods"
+    help = "HTTP Methods"
     clientItem = "stats"
     stats_keys = ("current", "1m", "5m", "1h",)
 
     windowTitle = "Methods"
     formatWidth = 116
-    additionalRows = 7
+    additionalRows = 8
 
     def updateRowCount(self):
         stats = defaultIfNone(self.clientData(), {})
@@ -1074,6 +926,9 @@
         methods = set()
         for key in self.stats_keys:
             methods.update(stats.get(key, {}).get("method", {}).keys())
+        if len(methods) != self.rowCount:
+            self.needsReset = True
+            return
 
         records = {}
         records_t = {}
@@ -1082,16 +937,6 @@
             records_t[key] = defaultIfNone(self.clientData(), {}).get(key, {}).get("method-t", {})
         self.iter += 1
 
-        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
         s1 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
             "", "------", "current---", "------", "1m--------", "------", "5m--------", "------", "1h--------",
         )
@@ -1101,16 +946,8 @@
         s3 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
             "", "", "(ms)", "", "(ms)", "", "(ms)", "", "(ms)",
         )
-        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
+        pt = self.tableHeader((s1, s2, s3,), len(records))
+
         total_methods = dict([(key, 0) for key in self.stats_keys])
         total_time = dict([(key, 0.0) for key in self.stats_keys])
         for method_type in sorted(methods):
@@ -1125,17 +962,10 @@
             s = " {:<40}{:>8}{:>10.1f}{:>8}{:>10.1f}{:>8}{:>10.1f}{:>8}{:>10.1f} ".format(
                 *items
             )
-            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
+            self.tableRow(
+                s, pt,
+                curses.A_REVERSE if changed else curses.A_NORMAL,
+            )
 
         items = ["Total:"]
         for key in self.stats_keys:
@@ -1151,17 +981,7 @@
         s2 = " {:<40}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10}{:>8}{:>10} ".format(
             *items
         )
-        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
+        self.tableFooter((s1, s2,), pt)
 
         if self.usesCurses:
             self.window.refresh()
@@ -1170,12 +990,160 @@
 
 
 
+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
+
+
+
 class DirectoryStatsWindow(BaseWindow):
     """
     Displays the status of the server's directory service calls
     """
 
-    help = "directory service stats"
+    help = "Directory Service"
     clientItem = "directory"
 
     windowTitle = "Directory Service"
@@ -1194,27 +1162,13 @@
 
         self.iter += 1
 
-        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
         s1 = " {:<40}{:>15}{:>15}{:>15} ".format(
             "Method", "Calls", "Total", "Average"
         )
         s2 = " {:<40}{:>15}{:>15}{:>15} ".format(
             "", "", "(sec)", "(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
+        pt = self.tableHeader((s1, s2,), len(records))
 
         overallCount = 0
         overallCountRatio = 0
@@ -1242,14 +1196,7 @@
                 timeSpent,
                 (1000.0 * timeSpent) / count,
             )
-            try:
-                if self.usesCurses:
-                    self.window.addstr(y, x, s)
-                else:
-                    print(s)
-            except curses.error:
-                pass
-            y += 1
+            self.tableRow(s, pt)
 
         s = " {:<40}{:>15d}{:>15.1f}{:>15.3f} ".format(
             "Total:",
@@ -1269,18 +1216,7 @@
             safeDivision(overallCountUncached, overallCountRatio, 100.0),
             "",
         )
-        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
+        self.tableFooter((s, s_cached, s_uncached), pt)
 
         if self.usesCurses:
             self.window.refresh()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151209/43868536/attachment-0001.html>


More information about the calendarserver-changes mailing list