Skip to content

Support newer python daemon package #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rkojedzinszky wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support newer python daemon package #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304271a
Using newer python-daemon package
Jan 12, 2018
3be51d9
Merge branch 'master' of https://github.com/grnet/ganetimgr into pyth…
Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django-registration-redux==1.6
# used for our registration workflow
paramiko==1.12.1
# used for user SSH key management
python-daemon==1.5.5
python-daemon==2.1.2
# used by watcher
setproctitle==1.0.1
# used by watcher to set it's process name
Expand Down
4 changes: 2 additions & 2 deletions watcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import atexit
import daemon
import logging
import daemon.pidlockfile
import daemon.pidfile
import setproctitle
from lockfile import LockError
from signal import SIGINT, SIGTERM
Expand Down Expand Up @@ -315,7 +315,7 @@ def fatal_signal_handler(signame):

def main():
opts, args = parse_arguments(sys.argv[1:])
pidf = daemon.pidlockfile.TimeoutPIDLockFile(opts.pid_file, 3)
pidf = daemon.pidfile.TimeoutPIDLockFile(opts.pid_file, 3)

lvl = logging.DEBUG if opts.debug else logging.INFO

Expand Down