[Zope-Checkins] SVN: zdaemon/trunk/ Updated release info:
Log message for revision 71854:
Updated release info:
New Features:
- Added support for setting environment variables in the configuration
file. This is useful when zdaemon is used to run programs that need
environment variables set (e.g. LD_LIBRARY_PATH).
- Added a command to rotate the transcript log.
Changed:
U zdaemon/trunk/CHANGES.txt
U zdaemon/trunk/README.txt
U zdaemon/trunk/setup.py
U zdaemon/trunk/src/zdaemon/README.txt
U zdaemon/trunk/src/zdaemon/component.xml
U zdaemon/trunk/src/zdaemon/schema.xml
U zdaemon/trunk/src/zdaemon/tests/tests.py
U zdaemon/trunk/src/zdaemon/zdctl.py
U zdaemon/trunk/src/zdaemon/zdrun.py
-=-
Modified: zdaemon/trunk/CHANGES.txt
===
--- zdaemon/trunk/CHANGES.txt 2007-01-10 10:16:55 UTC (rev 71853)
+++ zdaemon/trunk/CHANGES.txt 2007-01-10 11:36:01 UTC (rev 71854)
@@ -1,28 +1,18 @@
zdaemon Changelog
*
-To-Dos
-==
+zdaemon 2.0a2 (2007/01/08)
+==
-More docs:
+New Features
+
-- Document/demonstrate some important features, such as:
+- Added support for setting environment variables in the configuration
+ file. This is useful when zdaemon is used to run programs that need
+ environment variables set (e.g. LD_LIBRARY_PATH).
- - transcript log
+- Added a command to rotate the transcript log.
- - working directory
-
-Features
-
-- environment variables
-
-- transcript log rotation
-
-Bugs
-
-- help command
-
-
zdaemon 2.0a1 (2006/12/21)
==
@@ -105,3 +95,16 @@
- SVN tag: svn://svn.zope.org/repos/main/zdaemon/tags/zdaemon-1.1
- Tagged to make better 'svn:externals' linkage possible.
+
+To-Dos
+==
+
+More docs:
+
+- Document/demonstrate some important features, such as:
+
+ - working directory
+
+Bugs
+
+- help command
Modified: zdaemon/trunk/README.txt
===
--- zdaemon/trunk/README.txt2007-01-10 10:16:55 UTC (rev 71853)
+++ zdaemon/trunk/README.txt2007-01-10 11:36:01 UTC (rev 71854)
@@ -1,11 +1,10 @@
-
-``zdaemon`` process controller for Unix-ased systems
-
+*
+``zdaemon`` process controller for Unix-based systems
+*
-Overview
-
+.. contents::
-'zdaemon' is a Python package which provides APIs for managing spplications
+'zdaemon' is a Python package which provides APIs for managing applications
run as daemons. Its principal use to date has been to manage the application
server and storage server daemons for Zope / ZEO, although it is not limited
to running Python-based applications (for instance, it has been used to
Modified: zdaemon/trunk/setup.py
===
--- zdaemon/trunk/setup.py 2007-01-10 10:16:55 UTC (rev 71853)
+++ zdaemon/trunk/setup.py 2007-01-10 11:36:01 UTC (rev 71854)
@@ -29,7 +29,6 @@
entry_points=entry_points,
include_package_data = True,
install_requires=[ZConfig],
-tests_require=[zope.testing],
)
except ImportError:
from distutils.core import setup
@@ -38,7 +37,7 @@
name = zdaemon
setup(
name=name,
-version=2.0a1,
+version=2.0a2,
url=http://www.python.org/pypi/zdaemon;,
license=ZPL 2.1,
description=
@@ -53,7 +52,7 @@
'Detailed Documentation\n'
'**\n'
+ '\n' +
-read('src', 'zdaemon', 'README.txt')
+read('src/zdaemon/README.txt')
+ '\n' +
'Download\n'
'**\n'
@@ -61,5 +60,13 @@
packages=[zdaemon, zdaemon.tests],
package_dir={: src},
+classifiers = [
+ 'Development Status :: 3 - Alpha',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: System Administrators',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Topic :: Utilities',
+ 'Operating System :: POSIX',
+ ],
**setuptools_options)
Modified: zdaemon/trunk/src/zdaemon/README.txt
===
--- zdaemon/trunk/src/zdaemon/README.txt2007-01-10 10:16:55 UTC (rev
71853)
+++ zdaemon/trunk/src/zdaemon/README.txt2007-01-10 11:36:01 UTC (rev
71854)
@@ -7,7 +7,7 @@
Using zdaemon requires specifying a number of options, which can be
given in a configuration file, or as command-line options. It also
-accepts commands teling it what do do. The commants are:
+accepts commands teling it what do do. The commands are:
start
Start a process as a daemon
@@ -27,6 +27,10 @@
kill signal
Send a signal to the daemon process
+reopen_transcript
+Reopen the transcript
[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py The setUp and tearDown methods are owned by ZopeTestCase.
Log message for revision 71859: The setUp and tearDown methods are owned by ZopeTestCase. Changed: U Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py -=- Modified: Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py === --- Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2007-01-10 12:24:01 UTC (rev 71858) +++ Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2007-01-10 12:24:08 UTC (rev 71859) @@ -86,17 +86,11 @@ class ZPTUnicodeEncodingConflictResolution(ZopeTestCase): -def setUp(self): -super(ZPTUnicodeEncodingConflictResolution, self).setUp() +def afterSetUp(self): zope.component.provideAdapter(DefaultTraversable, (None,)) zope.component.provideAdapter(HTTPCharsets, (None,)) provideUtility(PreferredCharsetResolver, IUnicodeEncodingConflictResolver) -transaction.begin() -def tearDown(self): -transaction.abort() -self.app._p_jar.close() - def testISO_8859_15(self): manage_addPageTemplate(self.app, 'test', text='div tal:content=python: request.get(\'data\') /', ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/1.5/ prepare release
Log message for revision 71860: prepare release Changed: U Products.Five/branches/1.5/CHANGES.txt U Products.Five/branches/1.5/INSTALL.txt -=- Modified: Products.Five/branches/1.5/CHANGES.txt === --- Products.Five/branches/1.5/CHANGES.txt 2007-01-10 12:24:08 UTC (rev 71859) +++ Products.Five/branches/1.5/CHANGES.txt 2007-01-10 14:25:58 UTC (rev 71860) @@ -2,7 +2,7 @@ Five Changes -Five 1.5.2 (unreleased) +Five 1.5.2 (2007-01-10) === * Added support for the securityPolicy / ZCML directive known from Modified: Products.Five/branches/1.5/INSTALL.txt === --- Products.Five/branches/1.5/INSTALL.txt 2007-01-10 12:24:08 UTC (rev 71859) +++ Products.Five/branches/1.5/INSTALL.txt 2007-01-10 14:25:58 UTC (rev 71860) @@ -6,7 +6,7 @@ * Zope 2.10.2 with Python 2.4.3+ -Note that Five 1.5 is already part of Zope 2.10. You can still +Note that Five 1.5.x is already part of Zope 2.10.x. You can still install a newer Five version in your instance, if you like. It will override the Five product inside the Zope tree. ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/ - made room for Five trunk
Log message for revision 71870: - made room for Five trunk Changed: _U Zope/trunk/lib/python/Products/ -=- Property changes on: Zope/trunk/lib/python/Products ___ Name: svn:externals - Five-r 71820 svn://svn.zope.org/repos/main/Products.Five/trunk ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/Five/ - moved Five trunk
Log message for revision 71873: - moved Five trunk Changed: A Zope/trunk/lib/python/Products/Five/ -=- Copied: Zope/trunk/lib/python/Products/Five (from rev 71872, Products.Five/trunk) ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/trunk/ Five trunk was moved to Zope/trunk/lib/python/Products/Five
Log message for revision 71874: Five trunk was moved to Zope/trunk/lib/python/Products/Five Changed: D Products.Five/trunk/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/trunk/README.txt - added file that explains what happened with the trunk
Log message for revision 71877: - added file that explains what happened with the trunk Changed: A Products.Five/trunk/README.txt -=- Added: Products.Five/trunk/README.txt === --- Products.Five/trunk/README.txt 2007-01-10 16:39:32 UTC (rev 71876) +++ Products.Five/trunk/README.txt 2007-01-10 16:43:56 UTC (rev 71877) @@ -0,0 +1 @@ +Products.Five/trunk was moved to Zope/trunk/lib/python/Products/Five \ No newline at end of file Property changes on: Products.Five/trunk/README.txt ___ Name: svn:eol-style + native ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: zdaemon/trunk/src/zdaemon/ Accept duplicate command-line options to work with scripts that embed
Log message for revision 71890:
Accept duplicate command-line options to work with scripts that embed
configuration options, such as the name of the configuration file.
Changed:
U zdaemon/trunk/src/zdaemon/tests/tests.py
U zdaemon/trunk/src/zdaemon/zdctl.py
U zdaemon/trunk/src/zdaemon/zdoptions.py
-=-
Modified: zdaemon/trunk/src/zdaemon/tests/tests.py
===
--- zdaemon/trunk/src/zdaemon/tests/tests.py2007-01-10 18:26:21 UTC (rev
71889)
+++ zdaemon/trunk/src/zdaemon/tests/tests.py2007-01-10 18:27:06 UTC (rev
71890)
@@ -63,8 +63,29 @@
+def allow_duplicate_arguments():
+
+
+Wrapper scripts will often embed configuration arguments. This could
+cause a problem when zdaemon reinvokes itself, passing it's own set of
+configuration arguments. To deal with this, we'll allow duplicate
+arguments that have the same values.
+ open('conf', 'w').write(
+... '''
+... runner
+... program sleep 10
+... /runner
+... ''')
+ system(./zdaemon -Cconf -Cconf -Cconf start)
+. daemon process started, pid=21446
+
+ system(./zdaemon -Cconf -Cconf -Cconf stop)
+daemon process stopped
+
+
+
def setUp(test):
test.globs['_td'] = td = []
here = os.getcwd()
Modified: zdaemon/trunk/src/zdaemon/zdctl.py
===
--- zdaemon/trunk/src/zdaemon/zdctl.py 2007-01-10 18:26:21 UTC (rev 71889)
+++ zdaemon/trunk/src/zdaemon/zdctl.py 2007-01-10 18:27:06 UTC (rev 71890)
@@ -223,7 +223,7 @@
args = [self.options.python, self.options.zdrun]
else:
args = [self.options.python, sys.argv[0]]
-os.environ['ZDAEMON_MODE'] = '1'
+os.environ['DAEMON_MANAGER_MODE'] = '1'
args += self._get_override(-S, schemafile)
args += self._get_override(-C, configfile)
@@ -605,7 +605,7 @@
if args is None:
args = sys.argv[1:]
-if os.environ.get('ZDAEMON_MODE'):
+if os.environ.get('DAEMON_MANAGER_MODE'):
import zdaemon.zdrun
return zdaemon.zdrun.main(args)
Modified: zdaemon/trunk/src/zdaemon/zdoptions.py
===
--- zdaemon/trunk/src/zdaemon/zdoptions.py 2007-01-10 18:26:21 UTC (rev
71889)
+++ zdaemon/trunk/src/zdaemon/zdoptions.py 2007-01-10 18:27:06 UTC (rev
71890)
@@ -246,6 +246,10 @@
self.usage(invalid value for %s %r: %s % (opt, arg, msg))
if name and arg is not None:
if getattr(self, name) is not None:
+if getattr(self, name) == arg:
+# Repeated option, but we don't mind because it
+# just reinforces what we have.
+continue
self.usage(conflicting command line option %r % opt)
setattr(self, name, arg)
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: zdaemon/trunk/ Updated release info.
Log message for revision 71892: Updated release info. Changed: U zdaemon/trunk/CHANGES.txt U zdaemon/trunk/setup.py -=- Modified: zdaemon/trunk/CHANGES.txt === --- zdaemon/trunk/CHANGES.txt 2007-01-10 18:28:09 UTC (rev 71891) +++ zdaemon/trunk/CHANGES.txt 2007-01-10 18:28:15 UTC (rev 71892) @@ -1,8 +1,8 @@ zdaemon Changelog * -zdaemon 2.0a4 (2007/01/10) -== +zdaemon 2.0a4, 2.0a5 (2007/01/10) += Bugs Fixed -- Modified: zdaemon/trunk/setup.py === --- zdaemon/trunk/setup.py 2007-01-10 18:28:09 UTC (rev 71891) +++ zdaemon/trunk/setup.py 2007-01-10 18:28:15 UTC (rev 71892) @@ -37,7 +37,7 @@ name = zdaemon setup( name=name, -version=2.0a4, +version=2.0a5, url=http://www.python.org/pypi/zdaemon;, license=ZPL 2.1, description= ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
