Commit 723bf1df authored by Stefan H. Holek's avatar Stefan H. Holek

No that it works, make it pretty (#1233).

parent 4a6f5e89
......@@ -33,8 +33,6 @@
# old behavior is likely to cause problems as ZODB backends, like ZEO,
# gain new features.
from Zope.Startup.run import configure
_began_startup = 0
def startup():
......@@ -44,12 +42,7 @@ def startup():
# Already began (and maybe finished) startup, so don't run again
return
_began_startup = 1
# Load configuration file from (optional) environment variable
# Also see http://zope.org/Collectors/Zope/1233
import os
configfile = os.environ.get('ZOPE_CONFIG')
if configfile is not None:
configure(configfile)
_configure()
from Zope.App.startup import startup as _startup
_startup()
......@@ -64,6 +57,16 @@ def debug(*args, **kw):
import ZPublisher
return ZPublisher.test('Zope', *args, **kw)
from Zope.Startup.run import configure
def _configure():
# Load configuration file from (optional) environment variable
# Also see http://zope.org/Collectors/Zope/1233
import os
configfile = os.environ.get('ZOPE_CONFIG')
if configfile is not None:
configure(configfile)
# Zope.App.startup.startup() sets the following variables in this module.
DB = None
bobo_application = None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment