Try to fix daemon starting in windows

This commit is contained in:
Andrew Resch 2008-07-10 03:42:43 +00:00
parent 4d46faf014
commit 19a2ae45e9
2 changed files with 12 additions and 3 deletions

View File

@ -124,6 +124,14 @@ def start_daemon():
else:
os._exit(0)
if deluge.common.windows_check() and not options.donot:
port = 58846
if options.port:
port = options.port
import subprocess
subprocess.Popen(["deluged", "-p %s" % port])
os._exit(0)
from deluge.core.daemon import Daemon
Daemon(options, args)

View File

@ -36,6 +36,7 @@ import pkg_resources
import gobject
import socket
import os
import subprocess
import time
import threading
@ -120,7 +121,7 @@ class ConnectionManager(component.Component):
# If classic mode is set, we just start up a localhost daemon and connect to it
if self.gtkui_config["classic_mode"]:
uri = "http://localhost:58846"
os.spawnlp(os.P_NOWAIT, "deluged", "-p", "58846")
subprocess.Popen(["deluged", "-p 58846"])
time.sleep(0.1)
# We need to wait for the host to start before connecting
while not self.test_online_status(uri):
@ -152,7 +153,7 @@ class ConnectionManager(component.Component):
port = uri[7:].split(":")[1]
# First add it to the list
self.add_host("localhost", port)
os.spawnlp(os.P_NOWAIT, "deluged", "-p", port)
subprocess.Popen(["deluged", "-p %s" % port])
# We need to wait for the host to start before connecting
while not self.test_online_status(uri):
time.sleep(0.01)
@ -424,7 +425,7 @@ class ConnectionManager(component.Component):
port = str(port)
log.info("Starting localhost:%s daemon..", port)
# Spawn a local daemon
os.spawnlp(os.P_NOWAIT, "deluged", "-p", port)
subprocess.Popen(["deluged", "-p %s" % port])
def on_button_close_clicked(self, widget):
log.debug("on_button_close_clicked")