util get-ip fallback added

master
Stefan Krulj 14 years ago
parent 632f6f07e9
commit f2de91ec9a
  1. 6
      sys/config.py
  2. 5
      sys/util.py

@ -32,6 +32,12 @@ try:
PIDFILE = cp.get("General","PIDFILE")
except:
PIDFILE = 'pid'
try:
IP = cp.get("General","IP")
except:
IP = '127.0.0.1'
try:
S5B_PROXY = cp.get("General","PROXY")
except:

@ -3,6 +3,7 @@ import select
import socket
import threading
import random
import config
from Queue import Queue, Empty
MAGIC_PACKET = ""
@ -77,7 +78,7 @@ def get_local_ip():
try:
address = queue.get(False)
except Empty:
pass
else:
address = [config.IP]
finally:
waiting = False
return address[0]

Loading…
Cancel
Save