From 1706f81ce5e99e9c48730d5319ae05d9c9123f09 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 20 Dec 2018 14:04:57 +0000 Subject: [PATCH] Remove daemonize hack, as PR shippped Fixed by https://github.com/thesharp/daemonize/pull/70 --- catfish/__main__.py | 4 ---- setup.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/catfish/__main__.py b/catfish/__main__.py index 2a18e35..355bcc9 100644 --- a/catfish/__main__.py +++ b/catfish/__main__.py @@ -1,6 +1,4 @@ import functools -import os -import sys import click import daemonize @@ -31,8 +29,6 @@ def start(ctx, port, no_fork): "catfish", worker.PID_FILE, functools.partial(worker.run, port), verbose=True ) try: - # HACK: Temporary hack until https://github.com/thesharp/daemonize/pull/70 is solved - os._exit = sys.exit daemon.start() except SystemExit: pass diff --git a/setup.py b/setup.py index febb2e5..cb8dc4e 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( pathon_requires=">=3.6", install_requires=[ "click", - "daemonize", + "daemonize>=2.5.0", "psutil", "aiohttp", "ujson",