<!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>[15683] 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/15683">15683</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 13:55:13 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add option to rotate log hourly. Add option to compress each json log line. Remove unwanted data from server response.</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 (15682 => 15683)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-06-17 18:52:17 UTC (rev 15682)
+++ CalendarServer/trunk/calendarserver/tools/dashcollect.py 2016-06-17 20:55:13 UTC (rev 15683)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> import socket
</span><span class="cx"> import sys
</span><span class="cx"> import time
</span><ins>+import zlib
</ins><span class="cx">
</span><span class="cx"> verbose = False
</span><span class="cx"> def _verbose(log):
</span><span class="lines">@@ -78,6 +79,8 @@
</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><span class="cx"> parser.add_argument("-s", default="localhost:8200", help="Run the dash_thread service on the specified host:port")
</span><ins>+ parser.add_argument("-t", action="store_true", help="Rotate log files every hour [default: once per day]")
+ parser.add_argument("-z", action="store_true", help="zlib compress json records in log files")
</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">@@ -93,12 +96,12 @@
</span><span class="cx">
</span><span class="cx"> # Remove any existing logfile is asked
</span><span class="cx"> if args.n:
</span><del>- logfile = DashboardCollector.logfile(args.l)
</del><ins>+ logfile = DashboardCollector.logfile(args.l, args.t)
</ins><span class="cx"> if os.path.exists(logfile):
</span><span class="cx"> os.remove(logfile)
</span><span class="cx">
</span><span class="cx"> print("Running DashboardCollector...")
</span><del>- dash = DashboardCollector(config, args.l)
</del><ins>+ dash = DashboardCollector(config, args.l, args.t, args.z)
</ins><span class="cx"> dash_thread = Thread(target=dash.run)
</span><span class="cx"> dash_thread.start()
</span><span class="cx">
</span><span class="lines">@@ -359,8 +362,10 @@
</span><span class="cx"> updates.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, config, logdir):
</del><ins>+ def __init__(self, config, logdir, loghourly, compress_log):
</ins><span class="cx"> self.logdir = logdir
</span><ins>+ self.loghourly = loghourly
+ self.compress_log = compress_log
</ins><span class="cx"> self.title = config.title
</span><span class="cx"> self.pods = config.pods
</span><span class="cx"> self.sched = sched.scheduler(time.time, time.sleep)
</span><span class="lines">@@ -384,11 +389,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><del>- def logfile(logdir):
</del><ins>+ def logfile(logdir, loghourly):
</ins><span class="cx"> """
</span><del>- Log file name based on current date so it rotates once a day.
</del><ins>+ Log file name based on current date so it rotates once a day, or hourly.
</ins><span class="cx"> """
</span><del>- return os.path.join(logdir, "dashboard-{}.log".format(date.today().isoformat()))
</del><ins>+ today = date.today().isoformat()
+ if loghourly:
+ hour = datetime.now().hour
+ return os.path.join(logdir, "dashboard-{today}T{hour:02d}00.log".format(today=today, hour=hour))
+ else:
+ return os.path.join(logdir, "dashboard-{today}.log".format(today=today))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def update(self):
</span><span class="lines">@@ -407,9 +417,21 @@
</span><span class="cx"> for pod in self.pods:
</span><span class="cx"> pod.update(j["pods"])
</span><span class="cx">
</span><ins>+ # Filter out unwanted data
+ for jpod in j["pods"].values():
+ for jhost in jpod.values():
+ for stattype in ("current", "1m", "5m", "1h"):
+ for statkey in ("uid", "user-agent"):
+ try:
+ del jhost["stats"][stattype][statkey]
+ except KeyError:
+ pass
+
</ins><span class="cx"> # Append to log file
</span><del>- with open(self.logfile(self.logdir), "a") as f:
- f.write("\x1e{}\n".format(json.dumps(j)))
</del><ins>+ with open(self.logfile(self.logdir, self.loghourly), "a") as f:
+ jstr = json.dumps(j)
+ zstr = zlib.compress(jstr).encode("base64").replace("\n", "") if self.compress_log else jstr
+ f.write("\x1e{}\n".format(zstr))
</ins><span class="cx">
</span><span class="cx"> self.lastData = j
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>