fixes for server start functionality and inst examples

This commit is contained in:
Helmut Merz 2024-10-06 11:24:00 +02:00
parent dc87e32a63
commit cfa079de0d
5 changed files with 9 additions and 6 deletions

View file

@ -9,7 +9,7 @@ zope_conf = getenv('ZOPE_CONF', 'zope.conf')
server_port = getenv('SERVER_PORT', '8099')
shell_pw = (getenv('SHELL_PW', 'dummy'))
loops_path = (getenv('LOOPS_PATH', None))
# storage settings
from scopes.storage.db.postgres import StorageFactory

View file

@ -1,7 +1,8 @@
# inst/loops/runserver.sh
set -a
# use environment variables for instance-specific configuration:
#ZOPE_CONF=zope.conf
#SERVER_PORT=8099
#ZOPE_CONF=zope-1.conf
#SERVER_PORT=8091
python -c "from loops.server.main import main; main()"

View file

@ -1,7 +1,8 @@
# inst/loops/zshell.sh
set -a
# use environment variables for instance-specific configuration:
#ZOPE_CONF=zope.conf
#ZOPE_CONF=zope-1.conf
#LOOPS_PATH=sites/mysite
python -ic "from loops.server import psu; psu.setup()"

View file

@ -19,7 +19,8 @@ def run(app, config):
def main():
import config
zope_conf = getattr(config, 'zope_conf', 'zope.conf')
app = getWSGIApplication('zope.conf')
print(f'starting loops server... - conf: {zope_conf}')
app = getWSGIApplication(zope_conf)
run(app, config)
if __name__ == '__main__':

View file

@ -50,7 +50,7 @@ def closeConnection():
print('closing ZODB connection...')
conn.close()
def setup(zope_conf=None, loopsRootPath='sites/loops', config=config):
def setup(zope_conf=None, loopsRootPath=None, config=config):
if zope_conf is None:
zope_conf = getattr(config, 'zope_conf', 'zope.conf')
if loopsRootPath is None: