if self.report_host:
self.host = self.report_host
if not self.nick:
- self.nick = Hash(self.report_host)[:10]
+ self.nick = Hash(self.host)[:5].encode("hex")
self.prepend = 'E_'
if config.get('server', 'coin') == 'litecoin':
self.prepend = 'EL_'
try:
s = socket.socket()
s.connect(('irc.freenode.net', 6667))
- s.settimeout(300)
+ s.settimeout(0.1)
except:
s.close()
time.sleep(10)
continue
self.message = ''
+ out_msg = []
+
try:
s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n')
s.send('NICK ' + self.nick + '\n')
s.send('JOIN #electrum\n')
t = 0
+
while not self.processor.shared.stopped():
try:
data = s.recv(2048)
+ except socket.timeout, e:
+ if out_msg:
+ m = out_msg.pop(0)
+ s.send(m)
+ continue
except:
print_log( "irc: socket error" )
time.sleep(1)
continue
line = line.split()
if line[0] == 'PING':
- s.send('PONG ' + line[1] + '\n')
+ out_msg.append('PONG ' + line[1] + '\n')
elif '353' in line: # answer to /names
k = line.index('353')
for item in line[k+1:]:
if item.startswith(self.prepend):
- s.send('WHO %s\n' % item)
+ out_msg.append('WHO %s\n' % item)
elif '352' in line: # answer to /who
# warning: this is a horrible hack which apparently works
k = line.index('352')
self.peers[name] = (ip, host, ports)
if time.time() - t > 5*60:
- self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]})
+ #self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]})
s.send('NAMES #electrum\n')
t = time.time()
self.peers = {}
except:
traceback.print_exc(file=sys.stdout)
+ time.sleep(1)
finally:
s.close()
self.irc.start()
Processor.run(self)
- def process(self, request):
+ def process(self, session, request):
method = request['method']
params = request['params']
result = None
- if method in ['server.stop', 'server.info', 'server.heapy']:
+ if method in ['server.stop', 'server.info', 'server.debug']:
try:
password = request['params'][0]
except:
password = None
if password != self.password:
- self.push_response({'id': request['id'],
+ self.push_response(session,
+ {'id': request['id'],
'result': None,
'error': 'incorrect password'})
return
elif method == 'server.version':
result = VERSION
+ elif method == 'server.getpid':
+ import os
+ result = os.getpid()
+
elif method == 'server.stop':
self.shared.stop()
result = 'stopping, please wait until all threads terminate.'
"subscriptions": len(s.subscriptions)},
self.dispatcher.request_dispatcher.get_sessions())
- elif method == 'server.cache':
- p = self.dispatcher.request_dispatcher.processors['blockchain']
- result = len(repr(p.history_cache))
-
- elif method == 'server.load':
- p = self.dispatcher.request_dispatcher.processors['blockchain']
- result = p.queue.qsize()
-
- elif method == 'server.heapy':
+ elif method == 'server.debug':
try:
s = request['params'][1]
except:
if s:
from guppy import hpy
h = hpy()
+ bp = self.dispatcher.request_dispatcher.processors['blockchain']
try:
result = str(eval(s))
except:
result = "error"
else:
- print_log("unknown method", request)
+ print_log("unknown method", method)
if result != '':
- self.push_response({'id': request['id'], 'result': result})
+ self.push_response(session, {'id': request['id'], 'result': result})