total object stat, proper zeronet updater timeout catch, connection using connectionserver logger, trigger sitestorage onupdated when signing new file, named once events, only publish once same updated files, retry bad files every 20 min, trigger connection error on failed connection

plugins/Stats/StatsPlugin.py

@@ -105,53 +105,66 @@ class UiRequestPlugin(object):
 
 
 		# Objects
-		yield "<br><br><b>Objects in memory:</b><br>"
+
+		obj_count = {}
+		for obj in gc.get_objects():
+			obj_type = str(type(obj))
+			if not obj_type in obj_count:
+				obj_count[obj_type] = [0, 0]
+			obj_count[obj_type][0] += 1 # Count
+			obj_count[obj_type][1] += float(sys.getsizeof(obj))/1024 # Size
+
+		yield "<br><br><b>Objects in memory (total: %s, %.2fkb):</b><br>" % (len(obj_count), sum([stat[1] for stat in obj_count.values()]))
+
+		for obj, stat in sorted(obj_count.items(), key=lambda x: x[1][0], reverse=True): # Sorted by count
+			yield " - %.1fkb = %s x %s<br>" % (stat[1], stat[0], cgi.escape(obj))
+
 
 		from greenlet import greenlet
 		objs = [obj for obj in gc.get_objects() if isinstance(obj, greenlet)]
 		yield "<br>Greenlets (%s):<br>" % len(objs)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
+			yield " - %.1fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
 
 
 		from Worker import Worker
 		objs = [obj for obj in gc.get_objects() if isinstance(obj, Worker)]
 		yield "<br>Workers (%s):<br>" % len(objs)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
+			yield " - %.1fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
 
 
 		from Connection import Connection
 		objs = [obj for obj in gc.get_objects() if isinstance(obj, Connection)]
 		yield "<br>Connections (%s):<br>" % len(objs)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
+			yield " - %.1fkb: %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)))
+			yield " - %.1fkb: %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)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
+			yield " - %.1fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
 
 
 		objs = [obj for obj in gc.get_objects() if isinstance(obj, self.server.log.__class__)]
 		yield "<br>Loggers (%s):<br>" % len(objs)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj.name)))
+			yield " - %.1fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj.name)))
 
 
 		objs = [obj for obj in gc.get_objects() if isinstance(obj, UiRequest)]
 		yield "<br>UiRequest (%s):<br>" % len(objs)
 		for obj in objs:
-			yield " - %.3fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
+			yield " - %.1fkb: %s<br>" % (self.getObjSize(obj, hpy), cgi.escape(repr(obj)))
 
 		objs = [(key, val) for key, val in sys.modules.iteritems() if val is not None]
 		objs.sort()
@@ -159,4 +172,4 @@ class UiRequestPlugin(object):
 		for module_name, module in objs:
 			yield " - %.3fkb: %s %s<br>" % (self.getObjSize(module, hpy), module_name, cgi.escape(repr(module)))
 
-		yield "Done in %.3f" % (time.time()-s)
+		yield "Done in %.1f" % (time.time()-s)

plugins/Zeroname/updater/zeroname_updater.py

@@ -1,5 +1,5 @@
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
-import time, json, os, sys, re
+import time, json, os, sys, re, socket
 
 
 def publish():
@@ -47,6 +47,7 @@ def processNameOp(domain, value):
 
 def processBlock(block_id):
 	print "Processing block #%s..." % block_id
+	s = time.time()
 	block_hash = rpc.getblockhash(block_id)
 	block = rpc.getblock(block_hash)
 
@@ -58,7 +59,7 @@ def processBlock(block_id):
 			if "scriptPubKey" in vout and "nameOp" in vout["scriptPubKey"] and "name" in vout["scriptPubKey"]["nameOp"]:
 				name_op = vout["scriptPubKey"]["nameOp"]
 				updated += processNameOp(name_op["name"].replace("d/", ""), name_op["value"])
-	print "Done (updated %s)." % updated
+	print "Done in %.3fs (updated %s)." % (time.time()-s, updated)
 	if updated:
 		publish()
 
@@ -98,16 +99,23 @@ for block_id in range(config["lastprocessed"], last_block+1):
 #processBlock(223911) # Testing
 
 while 1:
-	print "Waiting for new block..."
+	print "Waiting for new block",
+	sys.stdout.flush()
 	while 1:
 		try:
 			rpc = AuthServiceProxy(rpc_url, timeout=60*5)
 			if (int(rpc.getinfo()["blocks"]) > last_block): break
 			time.sleep(1)
 			rpc.waitforblock()
+			print "Found"
 			break # Block found
-		except Exception, err: # Timeout
-			print "Exception", err
+		except socket.timeout: # Timeout
+			print ".",
+			sys.stdout.flush()
+		except Exception, err:
+			print "Exception", err.__class__, err
+			time.sleep(5)
+
 	last_block = int(rpc.getinfo()["blocks"])
 	for block_id in range(config["lastprocessed"]+1, last_block+1):
 		processBlock(block_id)