[CalendarServer-changes] [15598] CalendarServer/trunk/calendarserver/tools/dashview.py

[source_changes at macosforge.org]

Revision: 15598
          http://trac.calendarserver.org//changeset/15598
Author:   cdaboo at apple.com
Date:     2016-05-18 11:28:54 -0700 (Wed, 18 May 2016)
Log Message:
-----------
-s should be a single server not a list of servers.

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

Modified: CalendarServer/trunk/calendarserver/tools/dashview.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dashview.py	2016-05-18 18:25:10 UTC (rev 15597)
+++ CalendarServer/trunk/calendarserver/tools/dashview.py	2016-05-18 18:28:54 UTC (rev 15598)
@@ -41,30 +41,27 @@
 
 def main():
     parser = argparse.ArgumentParser(description="Dashboard collector viewer service for CalendarServer.")
-    parser.add_argument("-s", default=["localhost:8200"], help="Dashboard collector service host:port")
+    parser.add_argument("-s", default="localhost:8200", help="Dashboard collector service host:port")
     args = parser.parse_args()
 
     #
     # Get configuration
     #
-    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))
+    server = args.s
+    if not server.startswith("unix:"):
+        server = server.split(":")
+        if len(server) == 1:
+            server.append(8100)
         else:
-            servers.append(server)
+            server[1] = int(server[1])
+        server = tuple(server)
 
 
     def _wrapped(stdscrn):
         curses.curs_set(0)
         curses.use_default_colors()
         curses.init_pair(1, curses.COLOR_RED, curses.COLOR_WHITE)
-        d = Dashboard(servers, stdscrn)
+        d = Dashboard(server, stdscrn)
         d.run()
     curses.wrapper(_wrapped)
 
@@ -105,17 +102,16 @@
         "J": ("Jobs Panels", [],),
     }
 
-    def __init__(self, servers, screen):
+    def __init__(self, server, screen):
         self.screen = screen
         self.paused = False
         self.seconds = 1.0
         self.sched = sched.scheduler(time.time, time.sleep)
 
-        self.servers = servers
         self.selected_server = Point()
         self.server_window = None
 
-        self.client = DashboardClient(servers[0])
+        self.client = DashboardClient(server)
         self.client_error = False
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160518/838c3d4b/attachment-0001.html>