[CalendarServer-changes] [14911] CalendarServer/branches/users/cdaboo/cfod

source_changes at macosforge.org source_changes at macosforge.org
Wed Jun 24 10:00:15 PDT 2015


Revision: 14911
          http://trac.calendarserver.org//changeset/14911
Author:   cdaboo at apple.com
Date:     2015-06-24 10:00:15 -0700 (Wed, 24 Jun 2015)
Log Message:
-----------
More PyPy open file leaks.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/notifications.py
    CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py
    CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py
    CalendarServer/branches/users/cdaboo/cfod/txdav/common/datastore/file.py

Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/notifications.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/notifications.py	2015-06-24 14:39:34 UTC (rev 14910)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/notifications.py	2015-06-24 17:00:15 UTC (rev 14911)
@@ -156,7 +156,10 @@
         db_filename = os.path.join(self.resource.fp.path, NotificationsDatabase.db_basename)
         super(NotificationsDatabase, self).__init__(db_filename, True, autocommit=True)
 
+        self.resource._txn.postCommit(self._db_close)
+        self.resource._txn.postAbort(self._db_close)
 
+
     def allRecords(self):
 
         records = self._db_execute("select * from NOTIFICATIONS")

Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py	2015-06-24 14:39:34 UTC (rev 14910)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py	2015-06-24 17:00:15 UTC (rev 14911)
@@ -95,7 +95,10 @@
         db_filename = self.resource.fp.child(db_basename).path
         super(AbstractCalendarIndex, self).__init__(db_filename, False)
 
+        self.resource._txn.postCommit(self._db_close)
+        self.resource._txn.postAbort(self._db_close)
 
+
     def create(self):
         """
         Create the index and initialize it.

Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py	2015-06-24 14:39:34 UTC (rev 14910)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py	2015-06-24 17:00:15 UTC (rev 14911)
@@ -265,7 +265,10 @@
         else:
             self.reserver = SQLUIDReserver(self)
 
+        self.resource._txn.postCommit(self._db_close)
+        self.resource._txn.postAbort(self._db_close)
 
+
     def create(self):
         """
         Create the index and initialize it.

Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/common/datastore/file.py	2015-06-24 14:39:34 UTC (rev 14910)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/common/datastore/file.py	2015-06-24 17:00:15 UTC (rev 14911)
@@ -1458,6 +1458,7 @@
     """
     def __init__(self, resource):
         self.resource = resource
+        self._txn = self.resource._txn
         self.fp = self.resource._path
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150624/e8b0f7e1/attachment.html>


More information about the calendarserver-changes mailing list