<!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>[15605] CalendarServer/trunk/calendarserver/tools/dashcollect.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/15605">15605</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 17:06:12 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do all socket sends before reading to avoid blocking when talking to lots of hosts. Make sure listening port includes host too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashcollectpy">CalendarServer/trunk/calendarserver/tools/dashcollect.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashcollectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashcollect.py (15604 => 15605)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-18 23:59:02 UTC (rev 15604)
+++ CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-05-19 00:06:12 UTC (rev 15605)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> parser.add_argument("-f", help="Server config file")
</span><span class="cx"> parser.add_argument("-l", help="Log file directory")
</span><span class="cx"> parser.add_argument("-n", action="store_true", help="New log file")
</span><del>- parser.add_argument("-s", type=int, help="Run the dash_thread service on the specified port")
</del><ins>+ parser.add_argument("-s", default="localhost:8200", help="Run the dash_thread service on the specified host:port")
</ins><span class="cx"> parser.add_argument("-v", action="store_true", help="Verbose")
</span><span class="cx"> args = parser.parse_args()
</span><span class="cx"> if args.v:
</span><span class="lines">@@ -121,7 +121,16 @@
</span><span class="cx">
</span><span class="cx"> if args.s:
</span><span class="cx"> print("Running the CollectorService...")
</span><del>- server = CollectorService(("localhost", args.s), CollectorRequestHandler)
</del><ins>+ host = args.s
+ if not host.startswith("unix:"):
+ host = host.split(":")
+ if len(host) == 1:
+ host.append(8200)
+ else:
+ host[1] = int(host[1])
+ host = tuple(host)
+
+ server = CollectorService(host, CollectorRequestHandler)
</ins><span class="cx"> server.dashboard = dash
</span><span class="cx"> server_thread = Thread(target=server.serve_forever)
</span><span class="cx"> server_thread.daemon = True
</span><span class="lines">@@ -182,6 +191,15 @@
</span><span class="cx"> server.addItem("jobs")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def sendSock(self):
+ """
+ Update the data for each L{Server} in this L{Pod}.
+ """
+ _verbose(" Pod: {}".format(self.title))
+ for server in self.servers:
+ server.sendSock()
+
+
</ins><span class="cx"> def update(self, data):
</span><span class="cx"> """
</span><span class="cx"> Update the data for each L{Server} in this L{Pod}.
</span><span class="lines">@@ -218,16 +236,28 @@
</span><span class="cx"> self.items = []
</span><span class="cx">
</span><span class="cx">
</span><del>- def readSock(self, items):
</del><ins>+ def sendSock(self):
</ins><span class="cx"> """
</span><span class="cx"> Open a socket, send the specified request, and retrieve the response. Keep the socket open.
</span><span class="cx"> """
</span><ins>+ items = list(set(self.items))
</ins><span class="cx"> try:
</span><span class="cx"> if self.socket is None:
</span><span class="cx"> self.socket = socket.socket(socket.AF_INET if self.useTCP else socket.AF_UNIX, socket.SOCK_STREAM)
</span><span class="cx"> self.socket.connect(self.sockname)
</span><span class="cx"> self.socket.setblocking(0)
</span><span class="cx"> self.socket.sendall(json.dumps(items) + "\r\n")
</span><ins>+ except socket.error:
+ self.socket = None
+ except ValueError:
+ pass
+
+
+ def readSock(self, items):
+ """
+ Open a socket, send the specified request, and retrieve the response. Keep the socket open.
+ """
+ try:
</ins><span class="cx"> data = ""
</span><span class="cx"> t = time.time()
</span><span class="cx"> while not data.endswith("\n"):
</span><span class="lines">@@ -334,6 +364,9 @@
</span><span class="cx"> j["pods"] = OrderedDict()
</span><span class="cx">
</span><span class="cx"> for pod in self.pods:
</span><ins>+ pod.sendSock()
+
+ for pod in self.pods:
</ins><span class="cx"> pod.update(j["pods"])
</span><span class="cx">
</span><span class="cx"> # Append to log file
</span></span></pre>
</div>
</div>
</body>
</html>