<!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>[12032] CalendarServer/trunk/twext/application/masterchild.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/12032">12032</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 16:30:14 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make port and protocol options on master.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextapplicationmasterchildpy">CalendarServer/trunk/twext/application/masterchild.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextapplicationmasterchildpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/application/masterchild.py (12031 => 12032)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/application/masterchild.py        2013-12-04 18:02:33 UTC (rev 12031)
+++ CalendarServer/trunk/twext/application/masterchild.py        2013-12-05 00:30:14 UTC (rev 12032)
</span><span class="lines">@@ -15,9 +15,19 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Application container
</del><ins>+Application container for a service consisting of a master process that
+accepts connections and dispatches them via inherited file descriptors to
+child processes.
</ins><span class="cx"> """
</span><span class="cx">
</span><ins>+__all__ = [
+ "MasterOptions",
+ "MasterServiceMaker",
+ "ChildOptions",
+ "ChildServiceMaker",
+]
+
+
</ins><span class="cx"> import sys
</span><span class="cx"> from collections import namedtuple
</span><span class="cx">
</span><span class="lines">@@ -46,8 +56,46 @@
</span><span class="cx"> Options for a master process.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ def opt_protocol(self, value):
+ """
+ Protocol
+ """
+ try:
+ protocol = namedClass(value)
+ except (ValueError, AttributeError):
+ raise UsageError("Unknown protocol: {0}".format(value))
</ins><span class="cx">
</span><ins>+ self["protocol"] = protocol
</ins><span class="cx">
</span><ins>+
+ def opt_port(self, value):
+ """
+ Inherited file descriptor
+ """
+ try:
+ try:
+ port = int(value)
+ except ValueError:
+ raise ValueError("not an integer")
+
+ if port < 0:
+ raise ValueError("must be >=0")
+
+ except ValueError as e:
+ raise UsageError(
+ "Invalid port number {0!r}: {1}".format(value, e)
+ )
+
+ self["port"] = port
+
+
+ def postOptions(self):
+ for parameter in ("protocol", "port"):
+ if parameter not in self:
+ raise UsageError("{0} parameter is required".format(parameter))
+
+
+
</ins><span class="cx"> class SpawningInheritingProtocolFactory(InheritingProtocolFactory):
</span><span class="cx"> def __init__(self, dispatcher, spawningService, description):
</span><span class="cx"> super(SpawningInheritingProtocolFactory, self).__init__(
</span><span class="lines">@@ -67,8 +115,8 @@
</span><span class="cx"> def makeService(self, options):
</span><span class="cx"> service = MultiService()
</span><span class="cx">
</span><del>- port = 8000
- childProtocol = "twext.protocols.echo.EchoProtocol"
</del><ins>+ port = options["port"]
+ childProtocol = options["protocol"]
</ins><span class="cx">
</span><span class="cx"> # Dispatcher
</span><span class="cx"> statusWatcher = StatusWatcher()
</span><span class="lines">@@ -234,6 +282,18 @@
</span><span class="cx"> Options for a child process.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ def opt_protocol(self, value):
+ """
+ Protocol
+ """
+ try:
+ protocol = namedClass(value)
+ except (ValueError, AttributeError):
+ raise UsageError("Unknown protocol: {0}".format(value))
+
+ self["protocol"] = protocol
+
+
</ins><span class="cx"> def opt_inherited_fd(self, value):
</span><span class="cx"> """
</span><span class="cx"> Inherited file descriptor
</span><span class="lines">@@ -255,20 +315,8 @@
</span><span class="cx"> self["inherited-fd"] = fd
</span><span class="cx">
</span><span class="cx">
</span><del>- def opt_protocol(self, value):
- """
- Protocol
- """
- try:
- protocol = namedClass(value)
- except (ValueError, AttributeError):
- raise UsageError("Unknown protocol: {0}".format(value))
-
- self["protocol"] = protocol
-
-
</del><span class="cx"> def postOptions(self):
</span><del>- for parameter in ("inherited-fd", "protocol"):
</del><ins>+ for parameter in ("protocol", "inherited-fd"):
</ins><span class="cx"> if parameter not in self:
</span><span class="cx"> raise UsageError("{0} parameter is required".format(parameter))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>