LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-29 08:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #939 from Tafelpoot/daemon2

Browse source 
Fix Daemon on Windows
This commit is contained in:
ThomasV 2015-01-06 13:15:33 +01:00
commit af7d94d081
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/daemon.py
View file

@ -36,10 +36,11 @@ DAEMON_PORT=8001
def do_start_daemon(config): def do_start_daemon(config):
import subprocess import subprocess
logfile = open(os.path.join(config.path, 'daemon.log'),'w') logfile = open(os.path.join(config.path, 'daemon.log'),'w')
p = subprocess.Popen(["python2",__file__], stderr=logfile, stdout=logfile, close_fds=True) p = subprocess.Popen([sys.executable,__file__], stderr=logfile, stdout=logfile, close_fds=(os.name=="posix"))
print_stderr("starting daemon (PID %d)"%p.pid) print_stderr("starting daemon (PID %d)"%p.pid)
def get_daemon(config, start_daemon=True): def get_daemon(config, start_daemon=True):
import socket import socket
daemon_port = config.get('daemon_port', DAEMON_PORT) daemon_port = config.get('daemon_port', DAEMON_PORT)
@ -47,7 +48,7 @@ def get_daemon(config, start_daemon=True):
while True: while True:
try: try:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(('', daemon_port)) s.connect(('localhost', daemon_port))
if not daemon_started: if not daemon_started:
print_stderr("Connected to daemon on port %d"%daemon_port) print_stderr("Connected to daemon on port %d"%daemon_port)
return s return s
@ -190,7 +191,7 @@ def daemon_loop(server):
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
daemon_port = server.config.get('daemon_port', DAEMON_PORT) daemon_port = server.config.get('daemon_port', DAEMON_PORT)
daemon_timeout = server.config.get('daemon_timeout', 5*60) daemon_timeout = server.config.get('daemon_timeout', 5*60)
s.bind(('', daemon_port)) s.bind(('localhost', daemon_port))
s.listen(5) s.listen(5)
s.settimeout(1) s.settimeout(1)
t = time.time() t = time.time()