git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
19217b8
)
fixed sje397's indentation
author
Forrest Voight
<forrest@forre.st>
Wed, 8 Feb 2012 14:34:25 +0000 (09:34 -0500)
committer
Forrest Voight
<forrest@forre.st>
Wed, 8 Feb 2012 14:34:25 +0000 (09:34 -0500)
p2pool/main.py
patch
|
blob
|
history
diff --git
a/p2pool/main.py
b/p2pool/main.py
index
d020eb8
..
8139e90
100644
(file)
--- a/
p2pool/main.py
+++ b/
p2pool/main.py
@@
-375,7
+375,7
@@
def main(args, net, datadir_path, merged_urls):
print ' ...success!'
print
-
+
start_time = time.time()
@defer.inlineCallbacks
@@
-752,7
+752,7
@@
def main(args, net, datadir_path, merged_urls):
def get_peer_addresses():
return ' '.join(peer.transport.getPeer().host + (':' + str(peer.transport.getPeer().port) if peer.transport.getPeer().port != net.P2P_PORT else '') for peer in p2p_node.peers.itervalues())
-
+
def get_uptime():
return json.dumps(time.time() - start_time)