codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix-up the main startup code a bit so that Windows is always logging to 

a file and config folders are properly created for the daemon
This commit is contained in:
Andrew Resch 2008-08-17 00:56:29 +00:00
parent d3b005f30d
commit 1edc4bfe73
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
deluge/main.py
View File

@ -61,10 +61,19 @@ def start_ui():
if options.config: if options.config:
if not os.path.exists(options.config): if not os.path.exists(options.config):
# Try to create the config folder if it doesn't exist
try:
os.makedirs(options.config) os.makedirs(options.config)
except Exception, e:
pass
else: else:
if not os.path.exists(deluge.common.get_default_config_dir()): if not os.path.exists(deluge.common.get_default_config_dir()):
os.makedirs(deluge.common.get_default_config_dir()) os.makedirs(deluge.common.get_default_config_dir())
# Always log to a file in Windows
if deluge.common.windows_check() and not options.logfile:
options.logfile = "deluge.log"
if options.logfile: if options.logfile:
if options.config: if options.config:
logfile = os.path.join(options.config, options.logfile) logfile = os.path.join(options.config, options.logfile)
@ -108,6 +117,17 @@ def start_daemon():
# Get the options and args from the OptionParser # Get the options and args from the OptionParser
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.config:
if not os.path.exists(options.config):
# Try to create the config folder if it doesn't exist
try:
os.makedirs(options.config)
except Exception, e:
pass
else:
if not os.path.exists(deluge.common.get_default_config_dir()):
os.makedirs(deluge.common.get_default_config_dir())
# If the donot daemonize is set, then we just skip the forking # If the donot daemonize is set, then we just skip the forking
if not options.donot and not deluge.common.windows_check(): if not options.donot and not deluge.common.windows_check():
if os.fork() == 0: if os.fork() == 0:
@ -122,7 +142,7 @@ def start_daemon():
config_dir = deluge.common.get_default_config_dir() config_dir = deluge.common.get_default_config_dir()
logfile = os.path.join(config_dir, "deluged.log") logfile = os.path.join(config_dir, "deluged.log")
sys.stdout = open(logfile, "w") sys.stdout = open(logfile, "wb")
sys.stderr = sys.stdout sys.stderr = sys.stdout
sys.stdin = None sys.stdin = None
else: else:
@ -130,6 +150,21 @@ def start_daemon():
else: else:
os._exit(0) os._exit(0)
# Windows check, we log to the config folder by default
if not options.donot and deluge.common.windows_check():
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, "wb")
sys.stderr = sys.stdout
sys.stdin = None
from deluge.core.daemon import Daemon from deluge.core.daemon import Daemon
Daemon(options, args) Daemon(options, args)