[CalendarServer-changes] [9363] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jun 15 17:52:34 PDT 2012
Revision: 9363
http://trac.macosforge.org/projects/calendarserver/changeset/9363
Author: wsanchez at apple.com
Date: 2012-06-15 17:52:34 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
Use setproctitle, if available, so make our process title readable.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/caldav.py
CalendarServer/trunk/support/build.sh
CalendarServer/trunk/twistedcaldav/directory/directory.py
CalendarServer/trunk/twistedcaldav/mail.py
CalendarServer/trunk/twistedcaldav/notify.py
Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py 2012-06-15 18:19:21 UTC (rev 9362)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2012-06-16 00:52:34 UTC (rev 9363)
@@ -107,6 +107,7 @@
0, getModule(__name__).pathEntry.filePath.child("support").path)
from version import version as getVersion
version = "%s (%s*)" % getVersion()
+
twext.web2.server.VERSION = "CalendarServer/%s %s" % (
version.replace(" ", ""), twext.web2.server.VERSION,
)
@@ -583,6 +584,13 @@
"""
self.log_info("%s %s starting %s process..." % (self.description, version, config.ProcessType))
+ try:
+ from setproctitle import setproctitle
+ except ImportError:
+ pass
+ else:
+ setproctitle("CalendarServer %s [%s]" % (version, config.ProcessType))
+
serviceMethod = getattr(self, "makeService_%s" % (config.ProcessType,), None)
if not serviceMethod:
@@ -592,7 +600,6 @@
% (config.ProcessType,)
)
else:
-
#
# Configure Memcached Client Pool
#
@@ -601,8 +608,7 @@
config.Memcached.MaxClients,
)
- if config.ProcessType in ('Combined', 'Single'):
-
+ if config.ProcessType in ("Combined", "Single"):
# Process localization string files
processLocalizationFiles(config.Localization)
Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh 2012-06-15 18:19:21 UTC (rev 9362)
+++ CalendarServer/trunk/support/build.sh 2012-06-16 00:52:34 UTC (rev 9363)
@@ -753,41 +753,54 @@
"SQLParse" "sqlparse" "${sq}" \
"http://python-sqlparse.googlecode.com/files/${sq}.tar.gz";
- local fv="0.5.0";
- local fl="pyflakes-${fv}";
- py_dependency -o -v "${fv}" -m "568dab27c42e5822787aa8a603898672" \
- "Pyflakes" "pyflakes" "${fl}" \
- "${pypi}/p/pyflakes/${fl}.tar.gz";
+ local v="0.5.0";
+ local n="pyflakes";
+ local p="${n}-${v}";
+ py_dependency -o -v "${v}" -m "568dab27c42e5822787aa8a603898672" \
+ "Pyflakes" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
py_dependency -o -r HEAD \
"CalDAVClientLibrary" "caldavclientlibrary" "CalDAVClientLibrary" \
"${svn_uri_base}/CalDAVClientLibrary/trunk";
# Can't add "-v 2011g" to args because the version check expects numbers.
- local tz="pytz-2011n";
+ local n="pytz";
+ local p="${n}-2011n";
py_dependency -o -m "75ffdc113a4bcca8096ab953df746391" \
- "pytz" "pytz" "${tz}" \
- "http://pypi.python.org/packages/source/p/pytz/${tz}.tar.gz";
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
- local pv="2.5";
- local pc="pycrypto-${pv}";
- py_dependency -o -v "${pv}" -m "783e45d4a1a309e03ab378b00f97b291" \
- "PyCrypto" "pycrypto" "${pc}" \
- "http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${pc}.tar.gz";
+ local v="2.5";
+ local n="pycrypto";
+ local p="${n}-${v}";
+ py_dependency -o -v "${v}" -m "783e45d4a1a309e03ab378b00f97b291" \
+ "PyCrypto" "${n}" "${p}" \
+ "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
local v="0.1.2";
- local p="pyasn1-${v}";
+ local n="pyasn1";
+ local p="${n}-${v}";
py_dependency -o -v "${v}" -m "a7c67f5880a16a347a4d3ce445862a47" \
- "pyasn1" "pyasn1" "${p}" \
- "http://pypi.python.org/packages/source/p/pyasn1/pyasn1-0.1.2.tar.gz";
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+ local v="1.1.6";
+ local n="setproctitle";
+ local p="${n}-${v}";
+ py_dependency -o -v "${v}" -m "1e42e43b440214b971f4b33c21eac369" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/s/${n}/${p}.tar.gz";
+
svn_get "CalDAVTester" "${top}/CalDAVTester" \
"${svn_uri_base}/CalDAVTester/trunk" HEAD;
- local pd="pydoctor-0.3";
+ local v="0.3";
+ local n="pydoctor";
+ local p="${n}-${v}";
py_dependency -o -m "b000aa1fb458fe25952dadf26049ae68" \
- "pydoctor" "pydoctor" "${pd}" \
- "http://launchpadlibrarian.net/42323121/${pd}.tar.gz";
+ "${n}" "${n}" "${p}" \
+ "http://launchpadlibrarian.net/42323121/${p}.tar.gz";
if "${do_setup}"; then
cd "${caldav}";
Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py 2012-06-15 18:19:21 UTC (rev 9362)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py 2012-06-16 00:52:34 UTC (rev 9363)
@@ -874,6 +874,12 @@
options = GroupMembershipCacherOptions
def makeService(self, options):
+ try:
+ from setproctitle import setproctitle
+ except ImportError:
+ pass
+ else:
+ setproctitle("CalendarServer (group cacher)")
# Setup the directory
from calendarserver.tap.util import directoryFromConfig
Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py 2012-06-15 18:19:21 UTC (rev 9362)
+++ CalendarServer/trunk/twistedcaldav/mail.py 2012-06-16 00:52:34 UTC (rev 9363)
@@ -855,6 +855,12 @@
options = MailGatewayOptions
def makeService(self, options):
+ try:
+ from setproctitle import setproctitle
+ except ImportError:
+ pass
+ else:
+ setproctitle("CalendarServer (mail gateway)")
memcachepool.installPools(
config.Memcached.Pools,
Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py 2012-06-15 18:19:21 UTC (rev 9362)
+++ CalendarServer/trunk/twistedcaldav/notify.py 2012-06-16 00:52:34 UTC (rev 9363)
@@ -1463,6 +1463,12 @@
options = NotificationOptions
def makeService(self, options):
+ try:
+ from setproctitle import setproctitle
+ except ImportError:
+ pass
+ else:
+ setproctitle("CalendarServer (notifications)")
#
# Configure Memcached Client Pool
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120615/811587bf/attachment-0001.html>
More information about the calendarserver-changes
mailing list