[CalendarServer-changes] [6527] CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/ caldav.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 1 14:23:54 PDT 2010
Revision: 6527
http://trac.macosforge.org/projects/calendarserver/changeset/6527
Author: glyph at apple.com
Date: 2010-11-01 14:23:50 -0700 (Mon, 01 Nov 2010)
Log Message:
-----------
trailing whitespace
Modified Paths:
--------------
CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py
Modified: CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py 2010-11-01 21:23:26 UTC (rev 6526)
+++ CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py 2010-11-01 21:23:50 UTC (rev 6527)
@@ -111,19 +111,19 @@
gid = gidFromString(gid)
return (uid, gid)
-class CalDAVStatisticsProtocol (Protocol):
+class CalDAVStatisticsProtocol (Protocol):
- def connectionMade(self):
- stats = self.factory.logger.observer.getGlobalHits()
- self.transport.write("%s\r\n" % (stats,))
- self.transport.loseConnection()
+ def connectionMade(self):
+ stats = self.factory.logger.observer.getGlobalHits()
+ self.transport.write("%s\r\n" % (stats,))
+ self.transport.loseConnection()
-class CalDAVStatisticsServer (Factory):
+class CalDAVStatisticsServer (Factory):
- protocol = CalDAVStatisticsProtocol
+ protocol = CalDAVStatisticsProtocol
- def __init__(self, logObserver):
- self.logger = logObserver
+ def __init__(self, logObserver):
+ self.logger = logObserver
class ErrorLoggingMultiService(MultiService):
@@ -246,7 +246,7 @@
def postOptions(self):
self.loadConfiguration()
self.checkConfiguration()
-
+
def loadConfiguration(self):
if not os.path.exists(self["config"]):
print "Config file %s not found. Exiting." % (self["config"],)
@@ -261,7 +261,7 @@
sys.exit(1)
config.updateDefaults(self.overrides)
-
+
def checkDirectory(self, dirpath, description, access=None, create=None):
checkDirectory(dirpath, description, access=access, create=create)
@@ -295,7 +295,7 @@
# Require write access because one might not allow editing on /
access=os.W_OK,
)
-
+
#
# Verify that other root paths are OK
#
@@ -338,7 +338,7 @@
access=os.W_OK,
create=(0750, config.UserName, config.GroupName),
)
-
+
#
# Nuke the file log observer's time format.
#
@@ -926,21 +926,21 @@
for name, pool in config.Memcached.Pools.items():
if pool.ServerEnabled:
self.log_info("Adding memcached service for pool: %s" % (name,))
-
+
memcachedArgv = [
config.Memcached.memcached,
"-p", str(pool.Port),
"-l", pool.BindAddress,
"-U", "0",
]
-
+
if config.Memcached.MaxMemory is not 0:
memcachedArgv.extend(["-m", str(config.Memcached.MaxMemory)])
if config.UserName:
memcachedArgv.extend(["-u", config.UserName])
-
+
memcachedArgv.extend(config.Memcached.Options)
-
+
monitor.addProcess('memcached-%s' % (name,), memcachedArgv, env=parentEnv)
if (
@@ -1005,7 +1005,7 @@
monitor.addProcess("caldav_task", taskArgv, env=parentEnv)
- stats = CalDAVStatisticsServer(logger)
+ stats = CalDAVStatisticsServer(logger)
statsService = GroupOwnedUNIXServer(
gid, config.GlobalStatsSocket, stats, mode=0440
)
@@ -1016,10 +1016,10 @@
def deleteStaleSocketFiles(self):
-
+
# Check all socket files we use.
for checkSocket in [config.ControlSocket, config.GlobalStatsSocket] :
-
+
# See if the file exists.
if (os.path.exists(checkSocket)):
# See if the file represents a socket. If not, delete it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101101/b6b47ca7/attachment-0001.html>
More information about the calendarserver-changes
mailing list