codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-12 04:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify startup script to make a true unix daemon by using two fork()s

Browse Source 
Work will need to be done to make deluged a windows service
This commit is contained in:
Andrew Resch 2008-06-17 22:46:55 +00:00
parent f548dbce7c
commit 282f842663
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deluge/core/daemon.py
View File

@ -32,10 +32,18 @@
# statement from all source files in the program, then also delete it here.
import deluge.configmanager
import deluge.common
from deluge.log import LOG as log
class Daemon:
def __init__(self, options, args):
version = deluge.common.get_version()
if deluge.common.get_revision() != "":
version = version + "r" + deluge.common.get_revision()
log.info("Deluge daemon %s", version)
log.debug("options: %s", options)
log.debug("args: %s", args)
# Set the config directory
deluge.configmanager.set_config_dir(options.config)

51
deluge/main.py
View File

@ -37,6 +37,8 @@
"""Main starting point for Deluge. Contains the main() entry point."""
import os
import os.path
import sys
from optparse import OptionParser
import deluge.common
@ -71,6 +73,8 @@ def start_ui():
def start_daemon():
"""Entry point for daemon script"""
import deluge.common
# Setup the argument parser
parser = OptionParser(usage="%prog [options] [actions]",
version=deluge.common.get_version())
@ -80,29 +84,34 @@ def start_daemon():
help="Do not daemonize", action="store_true", default=False)
parser.add_option("-c", "--config", dest="config",
help="Set the config location", action="store", type="str")
parser.add_option("-l", "--logfile", dest="logfile",
help="Set the logfile location", action="store", type="str")
# Get the options and args from the OptionParser
(options, args) = parser.parse_args()
from deluge.log import LOG as log
version = deluge.common.get_version()
if deluge.common.get_revision() != "":
version = version + "r" + deluge.common.get_revision()
log.info("Deluge daemon %s", version)
log.debug("options: %s", options)
log.debug("args: %s", args)
from deluge.core.daemon import Daemon
# If the donot daemonize is set, then we just skip the forking
if not options.donot:
if os.fork() == 0:
os.setsid()
if os.fork() == 0:
if options.logfile:
logfile = options.logfile
else:
if options.config:
logfile = os.path.join(options.config, "deluged.log")
else:
config_dir = deluge.common.get_default_config_dir()
logfile = os.path.join(config_dir, "deluged.log")
sys.stdout = open(logfile, "w")
sys.stderr = sys.stdout
sys.stdin = None
else:
os._exit(0)
else:
os._exit(0)
if options.donot:
log.info("Starting daemon..")
Daemon(options, args)
else:
cmd = "deluged -d " + "".join(a for a in args)
if options.port != None:
cmd = cmd + " -p %s" % options.port
if options.config != None:
cmd = cmd + " -c %s" % options.config
os.popen2(cmd)
from deluge.core.daemon import Daemon
Daemon(options, args)