pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-09-19 15:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't run relay via dev script in dev mode by default

Browse source
This commit is contained in:
Izalia Mae 2024-03-15 21:23:57 -04:00
parent 94f4d32314
commit c961fadc9a
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
relay/dev.py
View file

@ -9,6 +9,7 @@ from pathlib import Path
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
from . import __version__ from . import __version__
from . import logger as logging
try: try:
from watchdog.observers import Observer from watchdog.observers import Observer
@ -128,7 +129,7 @@ class WatchHandler(PatternMatchingEventHandler):
if self.proc.poll() is not None: if self.proc.poll() is not None:
return return
print(f'Terminating process {self.proc.pid}') logging.info(f'Terminating process {self.proc.pid}')
self.proc.terminate() self.proc.terminate()
sec = 0.0 sec = 0.0
@ -137,11 +138,11 @@ class WatchHandler(PatternMatchingEventHandler):
sec += 0.1 sec += 0.1
if sec >= 5: if sec >= 5:
print('Failed to terminate. Killing process...') logging.error('Failed to terminate. Killing process...')
self.proc.kill() self.proc.kill()
break break
print('Process terminated') logging.info('Process terminated')
def run_proc(self, restart=False): def run_proc(self, restart=False):
@ -154,15 +155,13 @@ class WatchHandler(PatternMatchingEventHandler):
self.kill_proc() self.kill_proc()
if self.dev: cmd = [*self.cmd, '-d'] if self.dev else self.cmd
self.proc = subprocess.Popen([*self.cmd, '-d'], stdin = subprocess.PIPE)
else:
self.proc = subprocess.Popen(self.cmd, stdin = subprocess.PIPE)
self.proc = subprocess.Popen(cmd, stdin = subprocess.PIPE)
self.last_restart = timestamp self.last_restart = timestamp
print(f'Started process with PID {self.proc.pid}') logging.info('Started process with PID %i', self.proc.pid)
logging.info('Command: %s', ' '.join(cmd))
def on_any_event(self, event): def on_any_event(self, event):