[CalendarServer-changes] [15347] CalendarServer/trunk/txdav/caldav/datastore/scheduling
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 30 12:25:51 PST 2015
Revision: 15347
http://trac.calendarserver.org//changeset/15347
Author: cdaboo at apple.com
Date: 2015-11-30 12:25:51 -0800 (Mon, 30 Nov 2015)
Log Message:
-----------
Make sure iSchedule requests include extended access log details.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2015-11-30 16:26:19 UTC (rev 15346)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2015-11-30 20:25:51 UTC (rev 15347)
@@ -234,8 +234,12 @@
# Need a transaction to work with
txn = transactionFromRequest(request, self._newStore)
+ # Log extended item
+ if not hasattr(request, "extendedLogItems"):
+ request.extendedLogItems = {}
+
# This is a server-to-server scheduling operation.
- scheduler = IScheduleScheduler(txn, None, podding=self._podding)
+ scheduler = IScheduleScheduler(txn, None, logItems=request.extendedLogItems, podding=self._podding)
# Check content first
contentType = request.headers.getHeader("content-type")
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2015-11-30 16:26:19 UTC (rev 15346)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2015-11-30 20:25:51 UTC (rev 15347)
@@ -177,6 +177,13 @@
yield NamedLock.acquire(self.txn, "ImplicitUIDLock:{}".format(hashlib.md5(uid).hexdigest(),))
result = (yield self.doSchedulingDirectly("POST", originator, recipients, calendar))
+
+ if self.logItems is not None:
+ if self.checkForFreeBusy():
+ self.logItems["freebusy"] = "true"
+ else:
+ self.logItems["itip-method"] = self.calendar.propertyValue("METHOD").lower()
+
returnValue(result)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151130/fa2127c8/attachment.html>
More information about the calendarserver-changes
mailing list