[CalendarServer-changes] [14352] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14352
          http://trac.calendarserver.org//changeset/14352
Author:   sagen at apple.com
Date:     2015-01-29 12:22:01 -0800 (Thu, 29 Jan 2015)
Log Message:
-----------
Use new simpler launchd API

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/agent.py
    CalendarServer/trunk/requirements-stable.txt

Modified: CalendarServer/trunk/calendarserver/tools/agent.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/agent.py	2015-01-29 20:21:25 UTC (rev 14351)
+++ CalendarServer/trunk/calendarserver/tools/agent.py	2015-01-29 20:22:01 UTC (rev 14352)
@@ -34,7 +34,7 @@
 from plistlib import readPlistFromString, writePlistToString
 import socket
 
-from twext.python.launchd import getLaunchDSocketFDs
+from twext.python.launchd import launchActivateSocket
 from twext.python.log import Logger
 from twext.who.checker import HTTPDigestCredentialChecker
 from twext.who.opendirectory import (
@@ -153,8 +153,8 @@
     """
     from twisted.internet import reactor
 
-    sockets = getLaunchDSocketFDs()
-    fd = sockets["AgentSocket"][0]
+    sockets = launchActivateSocket("AgentSocket")
+    fd = sockets[0]
 
     family = socket.AF_INET
     endpoint = AdoptedStreamServerEndpoint(reactor, fd, family)

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2015-01-29 20:21:25 UTC (rev 14351)
+++ CalendarServer/trunk/requirements-stable.txt	2015-01-29 20:22:01 UTC (rev 14352)
@@ -36,7 +36,7 @@
             #pyOpenSSL
         pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14327#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14351#egg=twextpy
         cffi==0.8.6
             pycparser==2.10
         #twisted
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150129/bef764a6/attachment.html>