<!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>[12514] 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/12514">12514</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 13:37:41 -0800 (Fri, 31 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Trying to serialize records across amp</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 (12513 => 12514)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py        2014-01-31 21:27:07 UTC (rev 12513)
+++ CalendarServer/trunk/txdav/dps/client.py        2014-01-31 21:37:41 UTC (rev 12514)
</span><span class="lines">@@ -14,28 +14,25 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> 
</span><ins>+from txdav.dps.service import DirectoryService
</ins><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><del>-import cPickle as pickle
</del><span class="cx"> import sys
</span><span class="cx"> 
</span><span class="cx"> log = Logger()
</span><span class="cx"> 
</span><del>-print sys.path
-from txdav.dps.service import DirectoryService
</del><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> def makeBetterRequest():
</span><span class="cx"> 
</span><span class="cx">     shortName = sys.argv[1]
</span><span class="cx"> 
</span><del>-    ds = DirectoryService()
</del><ins>+    ds = DirectoryService(None)
</ins><span class="cx">     d = ds.recordWithShortName(RecordType.user, shortName)
</span><span class="cx"> 
</span><del>-    def gotResults(result):
-        result = pickle.loads(result)
-        print('Done: %s' % (result,))
</del><ins>+    def gotResults(record):
+        print('Done: %s' % (record,))
</ins><span class="cx">         reactor.stop()
</span><span class="cx">     d.addCallback(gotResults)
</span><span class="cx">     reactor.run()
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsprotocolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/protocol.py (12513 => 12514)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/protocol.py        2014-01-31 21:27:07 UTC (rev 12513)
+++ CalendarServer/trunk/txdav/dps/protocol.py        2014-01-31 21:37:41 UTC (rev 12514)
</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>+import cPickle as pickle
</ins><span class="cx"> 
</span><span class="cx"> log = Logger()
</span><span class="cx"> 
</span><span class="lines">@@ -29,9 +30,7 @@
</span><span class="cx">         ('shortName', amp.String()),
</span><span class="cx">     ]
</span><span class="cx">     response = [
</span><del>-        ('fullNames', amp.ListOf(amp.String())),
-        ('shortNames', amp.ListOf(amp.String())),
-        ('emailAddresses', amp.ListOf(amp.String())),
</del><ins>+        ('record', amp.String()),
</ins><span class="cx">     ]
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -54,10 +53,9 @@
</span><span class="cx">         record = (yield self._directory.recordWithShortName(
</span><span class="cx">             RecordType.lookupByName(recordType), shortName)
</span><span class="cx">         )
</span><ins>+        record.service = None
</ins><span class="cx">         response = {
</span><del>-            &quot;fullNames&quot;: [i.encode(&quot;utf-8&quot;) for i in record.fullNames],
-            &quot;shortNames&quot;: [i.encode(&quot;utf-8&quot;) for i in record.shortNames],
-            &quot;emailAddresses&quot;: [i.encode(&quot;utf-8&quot;) for i in record.emailAddresses],
</del><ins>+            &quot;record&quot;: pickle.dumps(record),
</ins><span class="cx">         }
</span><span class="cx">         log.debug(&quot;Responding with: {response}&quot;, response=response)
</span><span class="cx">         returnValue(response)
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/service.py (12513 => 12514)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py        2014-01-31 21:27:07 UTC (rev 12513)
+++ CalendarServer/trunk/txdav/dps/service.py        2014-01-31 21:37:41 UTC (rev 12514)
</span><span class="lines">@@ -40,13 +40,14 @@
</span><span class="cx"> class DirectoryService(BaseDirectoryService):
</span><span class="cx"> 
</span><span class="cx">     def _getConnection(self):
</span><del>-        path = config.DirectoryProxy.SocketPath
-        return ClientCreator(reactor, amp.AMP).connectUnix(path)
</del><ins>+        # path = config.DirectoryProxy.SocketPath
+        path = &quot;data/Logs/state/directory-proxy.sock&quot;
+        return ClientCreator(reactor, amp.AMP).connectUNIX(path)
</ins><span class="cx"> 
</span><span class="cx">     def recordWithShortName(self, recordType, shortName):
</span><span class="cx"> 
</span><del>-        def serialize(result):
-            return pickle.dumps(result)
</del><ins>+        def deserialize(result):
+            return pickle.loads(result['record'])
</ins><span class="cx"> 
</span><span class="cx">         def call(ampProto):
</span><span class="cx">             return ampProto.callRemote(
</span><span class="lines">@@ -55,7 +56,7 @@
</span><span class="cx">                 shortName=shortName.encode(&quot;utf-8&quot;)
</span><span class="cx">             )
</span><span class="cx"> 
</span><del>-        return self._getConnection().addCallback(call).addCallback(serialize)
</del><ins>+        return self._getConnection().addCallback(call).addCallback(deserialize)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>