oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

site connection stats, msgpack unpacker stats, make sure we dont skip any namecoin blocks, no more sha1 hash to content.json, keep 5 open connection in passive mode, publish got content to 5 peers, upnp retry 3 times, keep connection loggers

Browse source
This commit is contained in:
HelloZeroNet 2015-04-03 02:47:51 +02:00
parent 2491814070
commit 9c5176a8cb
7 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/Stats/StatsPlugin.py
View file

@ -64,7 +64,8 @@ class UiRequestPlugin(object):
except Exception, err:
pass
yield "Connections (%s):<br>" % len(main.file_server.connections)
# Connections
yield "<b>Connections</b> (%s):<br>" % len(main.file_server.connections)
yield "<table><tr> <th>id</th> <th>protocol</th> <th>type</th> <th>ip</th> <th>ping</th> <th>buff</th>"
yield "<th>idle</th> <th>open</th> <th>delay</th> <th>sent</th> <th>received</th> <th>last sent</th> <th>waiting</th> <th>version</th> <th>peerid</th> </tr>"
for connection in main.file_server.connections:
@ -87,6 +88,25 @@ class UiRequestPlugin(object):
])
yield "</table>"
# Sites
yield "<br><br><b>Sites</b>:"
yield "<table>"
yield "<tr><th>address</th> <th>peers</th> <th colspan=2>connected</th> <th>content.json</th> </tr>"
for site in self.server.sites.values():
yield self.formatTableRow([
("%s", site.address),
("%s", len(site.peers)),
("%s", len([peer for peer in site.peers.values() if peer.connection and peer.connection.connected])),
("%s", [peer.connection.id for peer in site.peers.values() if peer.connection and peer.connection.connected]),
("%s", len(site.content_manager.contents)),
])
yield "</table>"
# Objects
yield "<br><br><b>Objects in memory:</b><br>"
from greenlet import greenlet
objs = [obj for obj in gc.get_objects() if isinstance(obj, greenlet)]
yield "<br>Greenlets (%s):<br>" % len(objs)
@ -108,6 +128,13 @@ class UiRequestPlugin(object):
yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
from msgpack import Unpacker
objs = [obj for obj in gc.get_objects() if isinstance(obj, Unpacker)]
yield "<br>Msgpack unpacker (%s):<br>" % len(objs)
for obj in objs:
yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
from Site import Site
objs = [obj for obj in gc.get_objects() if isinstance(obj, Site)]
yield "<br>Sites (%s):<br>" % len(objs)

5
plugins/Zeroname/updater/zeroname_updater.py
View file

@ -107,9 +107,10 @@ while 1:
rpc.waitforblock()
break # Block found
except Exception, err: # Timeout
pass
print "Exception", err
last_block = int(rpc.getinfo()["blocks"])
processBlock(last_block)
for block_id in range(config["lastprocessed"]+1, last_block+1):
processBlock(block_id)
config["lastprocessed"] = last_block
open(config_path, "w").write(json.dumps(config, indent=2))