<!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>[12546] CalendarServer/trunk/txdav/dps</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/12546">12546</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 16:55:57 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reuse AMP connection</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsprotocolpy">CalendarServer/trunk/txdav/dps/protocol.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsservicepy">CalendarServer/trunk/txdav/dps/service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (12545 => 12546)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-02-03 22:00:02 UTC (rev 12545)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-02-04 00:55:57 UTC (rev 12546)
</span><span class="lines">@@ -18,29 +18,34 @@
</span><span class="cx"> from twext.who.idirectory import RecordType
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet import reactor
</span><ins>+from twisted.internet.defer import inlineCallbacks
+
</ins><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><del>-
-def makeBetterRequest():
-
</del><ins>+@inlineCallbacks
+def makeEvenBetterRequest():
</ins><span class="cx"> shortName = sys.argv[1]
</span><span class="cx">
</span><span class="cx"> ds = DirectoryService(None)
</span><del>- d = ds.recordWithShortName(RecordType.user, shortName)
</del><ins>+ record = (yield ds.recordWithShortName(RecordType.user, shortName))
+ print("A: {r}".format(r=record))
+ record = (yield ds.recordWithShortName(RecordType.user, shortName))
+ print("B: {r}".format(r=record))
</ins><span class="cx">
</span><del>- def gotResults(record):
- print('Done: %s' % (record,))
- reactor.stop()
</del><span class="cx">
</span><del>- def gotError(failure):
- print("Failure: %s" % (failure,))
- reactor.stop()
</del><ins>+def succeeded(result):
+ print("yay")
+ reactor.stop()
</ins><span class="cx">
</span><del>- d.addCallbacks(gotResults, gotError)
- reactor.run()
</del><span class="cx">
</span><ins>+def failed(failure):
+ print("boo: {f}".format(f=failure))
+ reactor.stop()
+
</ins><span class="cx"> if __name__ == '__main__':
</span><del>- makeBetterRequest()
</del><ins>+ d = makeEvenBetterRequest()
+ d.addCallbacks(succeeded, failed)
+ reactor.run()
</ins></span></pre></div>
<a id="CalendarServertrunktxdavdpsprotocolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/protocol.py (12545 => 12546)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/protocol.py 2014-02-03 22:00:02 UTC (rev 12545)
+++ CalendarServer/trunk/txdav/dps/protocol.py 2014-02-04 00:55:57 UTC (rev 12546)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> from twisted.protocols import amp
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twext.python.log import Logger
</span><ins>+
</ins><span class="cx"> import cPickle as pickle
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -36,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class DirectoryProxyAMPProtocol(amp.AMP):
</span><span class="cx"> """
</span><ins>+ Server side of directory proxy
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, directory):
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/service.py (12545 => 12546)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py 2014-02-03 22:00:02 UTC (rev 12545)
+++ CalendarServer/trunk/txdav/dps/service.py 2014-02-04 00:55:57 UTC (rev 12546)
</span><span class="lines">@@ -14,11 +14,15 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.who.xml import DirectoryService as XMLDirectoryService
-from twext.who.index import DirectoryService as BaseDirectoryService
</del><ins>+# Temporary:
+from txdav.who.xml import DirectoryService as XMLDirectoryService
+
+
+from twext.who.directory import DirectoryService as BaseDirectoryService
</ins><span class="cx"> from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><del>-from twext.who.idirectory import RecordType
</del><ins>+import twext.who.idirectory
+import txdav.who.idirectory
</ins><span class="cx">
</span><span class="cx"> from twisted.python.usage import Options, UsageError
</span><span class="cx"> from twisted.plugin import IPlugin
</span><span class="lines">@@ -34,6 +38,7 @@
</span><span class="cx"> from .protocol import DirectoryProxyAMPProtocol, RecordWithShortNameCommand
</span><span class="cx">
</span><span class="cx"> from twisted.internet import reactor
</span><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx"> from twisted.internet.protocol import ClientCreator
</span><span class="cx"> from twisted.protocols import amp
</span><span class="cx"> import cPickle as pickle
</span><span class="lines">@@ -42,16 +47,29 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryService(BaseDirectoryService):
</span><ins>+ """
+ Client side of directory proxy
+ """
</ins><span class="cx">
</span><span class="cx"> recordType = ConstantsContainer(
</span><del>- (RecordType.user, RecordType.group)
</del><ins>+ (twext.who.idirectory.RecordType,
+ txdav.who.idirectory.RecordType)
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+
+ @inlineCallbacks
</ins><span class="cx"> def _getConnection(self):
</span><span class="cx"> # path = config.DirectoryProxy.SocketPath
</span><span class="cx"> path = "data/Logs/state/directory-proxy.sock"
</span><del>- return ClientCreator(reactor, amp.AMP).connectUNIX(path)
</del><ins>+ if getattr(self, "_connection", None) is None:
+ log.debug("Creating connection")
+ connection = (yield ClientCreator(reactor, amp.AMP).connectUNIX(path))
+ self._connection = connection
+ else:
+ log.debug("Already have connection")
+ returnValue(self._connection)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><span class="cx">
</span><span class="cx"> def deserialize(result):
</span><span class="lines">@@ -78,6 +96,8 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class DirectoryProxyAMPFactory(Factory):
</span><span class="cx"> """
</span><span class="cx"> """
</span><span class="lines">@@ -92,6 +112,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class DirectoryProxyOptions(Options):
</span><span class="cx"> optParameters = [[
</span><span class="cx"> "config", "f", DEFAULT_CONFIG_FILE, "Path to configuration file."
</span></span></pre>
</div>
</div>
</body>
</html>