From c518627670f5614a2b9931471337a1a6b2ee344f Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 10 Jan 2020 22:51:50 +0100 Subject: [PATCH] Removed some log output --- maloja/__init__.py | 2 +- maloja/controller.py | 1 + maloja/server.py | 1 - maloja/supervisor.py | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/maloja/__init__.py b/maloja/__init__.py index c794de0..102edca 100644 --- a/maloja/__init__.py +++ b/maloja/__init__.py @@ -7,7 +7,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,2,1 +version = 2,2,2 versionstr = ".".join(str(n) for n in version) diff --git a/maloja/controller.py b/maloja/controller.py index e07a9fd..8c120df 100755 --- a/maloja/controller.py +++ b/maloja/controller.py @@ -166,6 +166,7 @@ def backuphere(): def update(): os.system("pip3 install malojaserver --upgrade --no-cache-dir") + restart() def fixdb(): from .fixexisting import fix diff --git a/maloja/server.py b/maloja/server.py index b8e4c19..b012bdc 100755 --- a/maloja/server.py +++ b/maloja/server.py @@ -88,7 +88,6 @@ def mainpage(): @webserver.error(505) def customerror(error): code = int(str(error).split(",")[0][1:]) - log("HTTP Error: " + str(code),module="error") if os.path.exists(pthjoin(WEBFOLDER,"errors",str(code) + ".pyhp")): return pyhpfile(pthjoin(WEBFOLDER,"errors",str(code) + ".pyhp"),{"errorcode":code}) diff --git a/maloja/supervisor.py b/maloja/supervisor.py index a84066f..a1e5cfe 100644 --- a/maloja/supervisor.py +++ b/maloja/supervisor.py @@ -18,7 +18,6 @@ while True: try: output = subprocess.check_output(["pidof","Maloja"]) pid = int(output) - log("Maloja is running, PID " + str(pid),module="supervisor") except: log("Maloja is not running, restarting...",module="supervisor") if get_settings("UPDATE_AFTER_CRASH"):