diff --git a/core/wrapper.py b/core/wrapper.py deleted file mode 100644 index 6025ea0..0000000 --- a/core/wrapper.py +++ /dev/null @@ -1,29 +0,0 @@ -"""Wrapper Class to handle reboots""" -import subprocess -import sys - - -class Wrapper: - def __init__(self, args, stdout): - """ - Wraps another program and helps with restarting should the program request. - :param args: Arguments used to run program - :param stdout: The stdout stream to send output to - """ - self._args = args - self.process = None - self._stdout = stdout - - def start(self): - """ - Start the wrapper. - :return: None - """ - self.process = subprocess.Popen(self._args, stdout=self._stdout) - while True: - while self.process.poll() is None: - pass - if self.process.returncode == 26: - self.process = subprocess.Popen(self._args, stdout=self._stdout) - else: - sys.exit() diff --git a/main.py b/main.py deleted file mode 100755 index 62b5c51..0000000 --- a/main.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -from core.wrapper import Wrapper - -api = Wrapper(['python3.9', '-m', 'gunicorn', "-k", "uvicorn.workers.UvicornWorker", - "--log-config", "log.conf", - '--bind', '0.0.0.0:8000', - 'api:api'], sys.stdout) -api.start() diff --git a/radical-api.service b/radical-api.service index 00ffff7..7ab1c93 100644 --- a/radical-api.service +++ b/radical-api.service @@ -9,7 +9,7 @@ User=radical-api Group=radical-api Restart=on-failure RestartSec=20 3 -ExecStart=/usr/bin/env python3.9 /otp/radical-api/main.py +ExecStart=/usr/bin/env python3.9 -m gunicorn -k uvicorn.workers.UvicornWorker --log-config log.conf --bind 0.0.0.0:8000 api:api [Install] WantedBy=multi.user.target diff --git a/routers/system.py b/routers/system.py index 8dcb1e0..2b20d87 100644 --- a/routers/system.py +++ b/routers/system.py @@ -12,4 +12,4 @@ router = APIRouter() @router.post("/system/update") def update(access_token: APIKey = Depends(get_system_key)): output = subprocess.check_output(['git', 'pull'], encoding='utf-8') - sys.exit(26) # exit with restart code + sys.exit()