diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index 7fc519b..2804f99 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@dev.krateng.ch", "github": "krateng" } -version = 2,13,2 +version = 2,13,3 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/proccontrol/control.py b/maloja/proccontrol/control.py index 2aa9554..818cbe9 100644 --- a/maloja/proccontrol/control.py +++ b/maloja/proccontrol/control.py @@ -47,7 +47,7 @@ def start(): sp = subprocess.Popen(["python3","-m","maloja.proccontrol.supervisor"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL) print(col["green"]("Maloja started!")) - port = malojaconfig["PORT"] + port = globalconf.malojaconfig["PORT"] print("Visit your server address (Port " + str(port) + ") to see your web interface. Visit /admin_setup to get started.") print("If you're installing this on your local machine, these links should get you there:") diff --git a/maloja/proccontrol/supervisor.py b/maloja/proccontrol/supervisor.py index 102ac7c..0a81cee 100644 --- a/maloja/proccontrol/supervisor.py +++ b/maloja/proccontrol/supervisor.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 import os +from ..globalconf import malojaconfig + import subprocess import setproctitle import signal from doreah.logging import log -from .globalconf import malojaconfig + from .control import getInstance