From f7e00a67fa936e9c63c465d5ad7bfd7fb4eaa664 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 15 Nov 2012 11:23:59 +0400 Subject: [PATCH] slightly improved messages --- backends/bitcoind/blockchain_processor.py | 2 +- backends/irc/__init__.py | 2 +- server.py | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index 78ef690..65af698 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -703,7 +703,7 @@ class BlockchainProcessor(Processor): self.memorypool_update() t3 = time.time() - print "mempool:", len(self.mempool_addresses), len(self.mempool_hist), "%.3fs"%(t3 - t2) + # print "mempool:", len(self.mempool_addresses), len(self.mempool_hist), "%.3fs"%(t3 - t2) if self.sent_height != self.height: diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py index 0c06d80..e70746c 100644 --- a/backends/irc/__init__.py +++ b/backends/irc/__init__.py @@ -149,7 +149,7 @@ class ServerProcessor(Processor): elif method == 'server.stop': self.shared.stop() - result = 'ok' + result = 'stopping, please wait until all threads terminate.' elif method == 'server.info': result = map(lambda s: { "time":s.time, diff --git a/server.py b/server.py index b727b65..6ada775 100755 --- a/server.py +++ b/server.py @@ -67,8 +67,13 @@ def create_config(): def run_rpc_command(command, stratum_tcp_port): import socket, json - s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) - s.connect(( host, int(stratum_tcp_port ))) + try: + s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) + s.connect(( host, int(stratum_tcp_port ))) + except: + print "cannot connect to server." + return + method = 'server.' + command request = json.dumps( { 'id':0, 'method':method, 'params':[password] } ) s.send(request + '\n') -- 1.7.1