nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-15 09:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

deluge: Make starting/stopping daemon safer

Browse Source 
- Match the daemon using uid, name and a pidfile for a safer match.

- Make start process idempotent.
This commit is contained in:
Sunil Mohan Adapa 2015-05-10 13:40:15 +05:30
parent 51e6aa3df6
commit 6a57dc78f3
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
actions/deluge
View File

@ -93,24 +93,35 @@ def subcommand_disable(_):
def subcommand_is_running(_):
"""Get whether deluge-web is running."""
if subprocess.call(['pgrep', 'deluge-web']) == 0:
try:
subprocess.check_call(['start-stop-daemon', '--status',
'--user', 'debian-deluged',
'--name', 'deluge-web',
'--pidfile', '/var/run/deluge-web.pid'])
print('yes')
else:
except subprocess.CalledProcessError:
print('no')
def subcommand_start(_):
"""Start deluge-web."""
subprocess.check_call(['start-stop-daemon', '--start', '--background',
subprocess.check_call(['start-stop-daemon', '--start', '--oknodo',
'--background', '--make-pidfile',
'--name', 'deluge-web',
'--exec', '/usr/bin/deluge-web',
'--chuid', 'debian-deluged',
'--user', 'debian-deluged',
'--startas', '/usr/bin/deluge-web',
'--pidfile', '/var/run/deluge-web.pid',
'--chuid', 'debian-deluged:debian-deluged',
'--', '--base=deluge'])
def subcommand_stop(_):
"""Stop deluge-web."""
subprocess.call(['killall', 'deluge-web'])
subprocess.check_call(['start-stop-daemon', '--stop', '--retry', '5',
'--oknodo', '--name', 'deluge-web',
'--user', 'debian-deluged',
'--pidfile', '/var/run/deluge-web.pid',
'--remove-pidfile'])
def setup():