# along with this program. If not, see <http://www.gnu.org/licenses/>.
import socket
-import select
import time
import sys
import os
import json
import Queue
from network import Network
-from util import print_msg
+from util import print_msg, print_stderr
from simple_config import SimpleConfig
+DAEMON_PORT=8001
class NetworkProxy(threading.Thread):
# connects to daemon
# sends requests, runs callbacks
- def __init__(self, config = {}):
+ def __init__(self, config=None):
+ if config is None:
+ config = {} # Do not use mutables as default arguments!
threading.Thread.__init__(self)
self.daemon = True
self.config = SimpleConfig(config) if type(config) == type({}) else config
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- self.daemon_port = config.get('daemon_port', 8000)
+ self.daemon_port = config.get('daemon_port', DAEMON_PORT)
self.message_id = 0
self.unanswered_requests = {}
self.subscriptions = {}
self.debug = False
self.lock = threading.Lock()
+ self.pending_transactions_for_notifications = []
def start(self, start_daemon=False):
return False
elif not daemon_started:
- print "Starting daemon [%s]"%self.config.get('server')
+ print_stderr( "Starting daemon [%s]"%self.config.get('server'))
daemon_started = True
pid = os.fork()
if (pid == 0): # The first child.
if message not in self.subscriptions[callback]:
self.subscriptions[callback].append(message)
- self.do_send( messages, callback )
+ self.send( messages, callback )
- def do_send(self, messages, callback):
+ def send(self, messages, callback):
"""return the ids of the requests that we sent"""
out = ''
ids = []
def synchronous_get(self, requests, timeout=100000000):
queue = Queue.Queue()
- ids = self.do_send(requests, lambda i,x: queue.put(x))
+ ids = self.send(requests, lambda i,x: queue.put(x))
id2 = ids[:]
res = {}
while ids:
self.network = network
self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- self.daemon_port = config.get('daemon_port', 8000)
+ self.daemon_port = config.get('daemon_port', DAEMON_PORT)
self.server.bind(('', self.daemon_port))
self.server.listen(5)
self.server.settimeout(1)