Browse Source

get block num in locked section

283
ThomasV 14 years ago
parent
commit
4e2200dbdc
  1. 8
      server/server.py

8
server/server.py

@ -44,7 +44,7 @@ except:
stopping = False stopping = False
block_number = -1
sessions = {} sessions = {}
sessions_last_time = {} sessions_last_time = {}
dblock = thread.allocate_lock() dblock = thread.allocate_lock()
@ -314,8 +314,7 @@ def client_thread(ipaddr,conn):
return return
if cmd=='b': if cmd=='b':
out = "%d"%store.get_block_number(1) out = "%d"%block_number
elif cmd=='session': elif cmd=='session':
session_id = random_string(10) session_id = random_string(10)
try: try:
@ -348,7 +347,7 @@ def client_thread(ipaddr,conn):
if last_status != status: if last_status != status:
sessions[session_id][addr] = status sessions[session_id][addr] = status
ret[addr] = status ret[addr] = status
out = repr( (store.get_block_number(1), ret ) ) out = repr( (block_number, ret ) )
elif cmd == 'h': elif cmd == 'h':
# history # history
@ -509,6 +508,7 @@ if __name__ == '__main__':
dblock.acquire() dblock.acquire()
store.catch_up() store.catch_up()
memorypool_update(store) memorypool_update(store)
block_number = store.get_block_number(1)
dblock.release() dblock.release()
except: except:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)

Loading…
Cancel
Save