Athemis/phytopi
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix killing of child processes without killing the whole app

Browse source
This commit is contained in:
Alexander Minges 2019-02-01 11:27:28 +01:00
parent a8c7d8e74f
commit 7558c6d196
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phytopi/camera/camera.py
View file

@ -8,17 +8,15 @@ import signal
from enum import Enum from enum import Enum
from phytopi import db, models, app from phytopi import db, models, app
# map commands class CameraActionError(Exception):
camera_cmds = { pass
'start_timelapse': 'tl 1',
'stop_timelapse': 'tl 0'
}
class CameraStatus(Enum): class CameraStatus(Enum):
STOPPED = 0 STOPPED = 0
IDLE = 1 IDLE = 1
TIMELAPSE = 2 TIMELAPSE = 2
VIDEO = 3 VIDEO = 3
SHOT = 4
class CameraWorker(object): class CameraWorker(object):
def __init__(self, pidfile='/tmp/raspimjpeg.pid', executable='/usr/local/bin/raspimjpeg', fifo='/dev/shm/mjpeg/FIFO', app=None): def __init__(self, pidfile='/tmp/raspimjpeg.pid', executable='/usr/local/bin/raspimjpeg', fifo='/dev/shm/mjpeg/FIFO', app=None):
@ -45,7 +43,7 @@ class CameraWorker(object):
pass pass
# if not, spawn new process and create pid file # if not, spawn new process and create pid file
self.proc = subprocess.Popen([self.executable]) self.proc = subprocess.Popen([self.executable], preexec_fn=os.setsid)
self.pid = self.proc.pid self.pid = self.proc.pid
with open(self.pidfile, 'w') as fh: with open(self.pidfile, 'w') as fh:
fh.write(str(self.pid)) fh.write(str(self.pid))
@ -58,10 +56,16 @@ class CameraWorker(object):
self.status = CameraStatus.STOPPED self.status = CameraStatus.STOPPED
def send_cmd(self, cmd): def send_cmd(self, cmd):
if cmd in camera_cmds: with open(self.fifo, 'w') as fh:
with open(self.fifo, 'w') as fh: fh.write(cmd)
fh.write(cmd)
if cmd == camera_cmds['start_timelapse']: def timelapse(self, interval = 0):
self.status = CameraStatus.TIMELAPSE if self.status == CameraStatus.IDLE:
if cmd == camera_cmds['stop_timelapse']: self.send_cmd('tl {}'.format(str(interval)))
self.status = CameraStatus.IDLE self.status = CameraStatus.TIMELAPSE
elif self.status == CameraStatus.TIMELAPSE:
self.send_cmd('tl 0')
self.status == CameraStatus.IDLE
else:
raise CameraActionError('Camera neither idle nor in timelapse mode!')