AaronFiore/electrum
1
0
Fork 0
Code Activity

log messages

Browse Source
This commit is contained in:
ThomasV
2011-12-23 16:51:54 +03:00
parent 3203dc0934
commit 1947e8a133
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/server.py
View File

@@ -405,26 +405,21 @@ def cmd_poll(session_id):
return out return out
def new_session(addresses, version, ipaddr): def new_session(addresses, version):
session_id = random_string(10) session_id = random_string(10)
sessions[session_id] = { 'addresses':{}, 'version':version }
print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
sessions[session_id] = { 'addresses':{}, 'version':version, 'ip':ipaddr }
for a in addresses: for a in addresses:
sessions[session_id]['addresses'][a] = '' sessions[session_id]['addresses'][a] = ''
out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) ) out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
sessions[session_id]['last_time'] = time.time() sessions[session_id]['last_time'] = time.time()
return out return out
def update_session(session_id,addresses,ipaddr): def update_session(session_id,addresses):
print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
sessions[session_id]['addresses'] = {} sessions[session_id]['addresses'] = {}
for a in addresses: for a in addresses:
sessions[session_id]['addresses'][a] = '' sessions[session_id]['addresses'][a] = ''
out = 'ok'
sessions[session_id]['last_time'] = time.time() sessions[session_id]['last_time'] = time.time()
return 'ok'
def listen_thread(store): def listen_thread(store):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -485,7 +480,8 @@ def do_command(cmd, data, ipaddr):
except: except:
print "error", data print "error", data
return None return None
out = new_session(addresses, version, ipaddr) print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
out = new_session(addresses, version)
elif cmd=='update_session': elif cmd=='update_session':
try: try:
@@ -493,8 +489,8 @@ def do_command(cmd, data, ipaddr):
except: except:
print "error" print "error"
return None return None
out = update_session(session_id,addresses,ipaddr) print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
out = update_session(session_id,addresses)
elif cmd == 'bccapi_login': elif cmd == 'bccapi_login':
import electrum import electrum