rev119, Protection against update flood, Cache webfonts, Publish batc…

…hing, Task failed holds Peer objects, Remove peer from failed on addTask, Noparallel memory leak fix

src/Config.py

@@ -4,7 +4,7 @@
 class Config(object):
 	def __init__(self):
 		self.version = "0.2.9"
-		self.rev = 116
+		self.rev = 119
 		self.parser = self.createArguments()
 		argv = sys.argv[:] # Copy command line arguments
 		argv = self.parseConfig(argv) # Add arguments from config file

src/Connection/Connection.py

@@ -117,6 +117,9 @@ def handleIncomingConnection(self, sock):
 
 	# Message loop for connection
 	def messageLoop(self, firstchar=None):
+		if not self.sock:
+			self.log("Socket error: No socket found")
+			return False
 		sock = self.sock
 		try:
 			if not firstchar: firstchar = sock.recv(1)
@@ -317,4 +320,5 @@ def close(self):
 		# Little cleanup
 		del self.unpacker
 		del self.sock
+		self.sock = None
 		self.unpacker = None

src/Connection/ConnectionServer.py

@@ -14,6 +14,7 @@ def __init__(self, ip=None, port=None, request_handler=None):
 		self.port = port
 		self.last_connection_id = 1 # Connection id incrementer
 		self.log = logging.getLogger("ConnServer")
+		self.port_opened = None
 
 		self.connections = [] # Connections
 		self.ips = {} # Connection by ip

src/File/FileRequest.py

@@ -2,6 +2,7 @@
 from cStringIO import StringIO
 from Debug import Debug
 from Config import config
+from util import RateLimit
 
 FILE_BUFF = 1024*512
 
@@ -14,31 +15,42 @@ def __init__(self, server, connection):
 		self.req_id = None
 		self.sites = self.server.sites
 		self.log = server.log
+		self.responded = False # Responded to the request
 
 
 	def unpackAddress(self, packed):
 		return (socket.inet_ntoa(packed[0:4]), struct.unpack_from("H", packed, 4)[0])
 
 
 	def send(self, msg):
-		self.connection.send(msg)
+		if not self.connection.closed:
+			self.connection.send(msg)
 
 
 	def response(self, msg):
+		if self.responded:
+			self.log.debug("Req id %s already responded" % self.req_id)
+			return
 		if not isinstance(msg, dict): # If msg not a dict create a {"body": msg}
 			msg = {"body": msg}
 		msg["cmd"] = "response"
 		msg["to"] = self.req_id
+		self.responded = True
 		self.send(msg)
 
 
 	# Route file requests
 	def route(self, cmd, req_id, params):
 		self.req_id = req_id
+
 		if cmd == "getFile":
 			self.actionGetFile(params)
 		elif cmd == "update":
-			self.actionUpdate(params)
+			event = "%s update %s %s" % (self.connection.id, params["site"], params["inner_path"])
+			if not RateLimit.isAllowed(event): # There was already an updat for this file in the last 10 second
+				self.response({"ok": "File update queued"})
+			RateLimit.callAsync(event, 10, self.actionUpdate, params) # If called more than once within 10 sec only keep the last update
+
 		elif cmd == "pex":
 			self.actionPex(params)
 		elif cmd == "ping":

src/Site/Site.py

@@ -96,7 +96,6 @@ def getNextSizeLimit(self):
 
 
 	# Download all file from content.json
-	@util.Noparallel(blocking=True)
 	def downloadContent(self, inner_path, download_files=True, peer=None):
 		s = time.time()
 		self.log.debug("Downloading %s..." % inner_path)
@@ -223,6 +222,7 @@ def publisher(self, inner_path, peers, published, limit, event_done=None):
 
 
 	# Update content.json on peers
+	@util.Noparallel()
 	def publish(self, limit=5, inner_path="content.json"):
 		self.log.info( "Publishing to %s/%s peers..." % (limit, len(self.peers)) )
 		published = [] # Successfully published (Peer)

src/Ui/UiRequest.py

@@ -111,7 +111,7 @@ def sendHeader(self, status=200, content_type="text/html", extra_headers=[]):
 		if self.env["REQUEST_METHOD"] == "OPTIONS":
 			headers.append(("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")) # Allow json access
 
-		if (self.env["REQUEST_METHOD"] == "OPTIONS" or not self.isAjaxRequest()) and status == 200 and (content_type == "text/css" or content_type == "application/javascript" or self.env["REQUEST_METHOD"] == "OPTIONS" or content_type.startswith("image")): # Cache Css, Js, Image files for 10min
+		if (self.env["REQUEST_METHOD"] == "OPTIONS" or not self.isAjaxRequest()) and status == 200 and (content_type == "text/css" or content_type.startswith("application") or self.env["REQUEST_METHOD"] == "OPTIONS" or content_type.startswith("image")): # Cache Css, Js, Image files for 10min
 			headers.append(("Cache-Control", "public, max-age=600")) # Cache 10 min
 		else: # Images, Css, Js
 			headers.append(("Cache-Control", "no-cache, no-store, private, must-revalidate, max-age=0")) # No caching at all

src/Ui/UiWebsocket.py

@@ -2,7 +2,7 @@
 from Config import config
 from Site import SiteManager
 from Debug import Debug
-from util import QueryJson
+from util import QueryJson, RateLimit
 from Plugin import PluginManager
 
 @PluginManager.acceptPlugins
@@ -149,21 +149,6 @@ def handleRequest(self, data):
 			func(req["id"], params)
 
 
-	# - Actions -
-
-	# Do callback on response {"cmd": "response", "to": message_id, "result": result}
-	def actionResponse(self, to, result):
-		if to in self.waiting_cb:
-			self.waiting_cb[to](result) # Call callback function
-		else:
-			self.log.error("Websocket callback not found: %s, %s" % (to, result))
-
-
-	# Send a simple pong answer
-	def actionPing(self, to):
-		self.response(to, "pong")
-
-
 	# Format site info
 	def formatSiteInfo(self, site, create_user=True):
 		content = site.content_manager.contents.get("content.json")
@@ -198,21 +183,6 @@ def formatSiteInfo(self, site, create_user=True):
 		return ret
 
 
-	# Send site details
-	def actionSiteInfo(self, to, file_status = None):
-		ret = self.formatSiteInfo(self.site)
-		if file_status: # Client queries file status
-			if self.site.storage.isFile(file_status): # File exits, add event done
-				ret["event"] = ("file_done", file_status)
-		self.response(to, ret)
-
-
-	# Join to an event channel
-	def actionChannelJoin(self, to, channel):
-		if channel not in self.channels:
-			self.channels.append(channel)
-
-
 	def formatServerInfo(self):
 		return {
 			"ip_external": bool(sys.modules["main"].file_server.port_opened),
@@ -228,6 +198,36 @@ def formatServerInfo(self):
 		}
 
 
+	# - Actions -
+
+	# Do callback on response {"cmd": "response", "to": message_id, "result": result}
+	def actionResponse(self, to, result):
+		if to in self.waiting_cb:
+			self.waiting_cb[to](result) # Call callback function
+		else:
+			self.log.error("Websocket callback not found: %s, %s" % (to, result))
+
+
+	# Send a simple pong answer
+	def actionPing(self, to):
+		self.response(to, "pong")
+
+
+	# Send site details
+	def actionSiteInfo(self, to, file_status = None):
+		ret = self.formatSiteInfo(self.site)
+		if file_status: # Client queries file status
+			if self.site.storage.isFile(file_status): # File exits, add event done
+				ret["event"] = ("file_done", file_status)
+		self.response(to, ret)
+
+
+	# Join to an event channel
+	def actionChannelJoin(self, to, channel):
+		if channel not in self.channels:
+			self.channels.append(channel)
+
+
 	# Server variables
 	def actionServerInfo(self, to):
 		ret = self.formatServerInfo()
@@ -261,18 +261,28 @@ def actionSitePublish(self, to, privatekey=None, inner_path="content.json"):
 			site.saveSettings()
 			site.announce()
 
-		published = site.publish(5, inner_path) # Publish to 5 peer
 
+		event_name = "publish %s %s" % (site.address, inner_path)
+		thread = RateLimit.callAsync(event_name, 7, site.publish, 5, inner_path) # Only publish once in 7 second to 5 peers
+		notification = "linked" not in dir(thread) # Only display notification on first callback
+		thread.linked = True
+		thread.link(lambda thread: self.cbSitePublish(to, thread, notification)) # At the end callback with request id and thread
+
+
+	# Callback of site publish
+	def cbSitePublish(self, to, thread, notification=True):
+		site = self.site
+		published = thread.value
 		if published>0: # Successfuly published
-			self.cmd("notification", ["done", "Content published to %s peers." % published, 5000])
+			if notification: self.cmd("notification", ["done", "Content published to %s peers." % published, 5000])
 			self.response(to, "ok")
-			site.updateWebsocket() # Send updated site data to local websocket clients
+			if notification: site.updateWebsocket() # Send updated site data to local websocket clients
 		else:
 			if len(site.peers) == 0:
-				self.cmd("notification", ["info", "No peers found, but your content is ready to access."])
+				if notification: self.cmd("notification", ["info", "No peers found, but your content is ready to access."])
 				self.response(to, "No peers found, but your content is ready to access.")
 			else:
-				self.cmd("notification", ["error", "Content publish failed."])
+				if notification: self.cmd("notification", ["error", "Content publish failed."])
 				self.response(to, "Content publish failed.")
 
 
@@ -326,6 +336,7 @@ def actionFileGet(self, to, inner_path):
 		return self.response(to, body)
 
 
+
 	# - Admin actions -
 
 	# List all site info

src/Worker/Worker.py

@@ -61,7 +61,7 @@ def downloader(self):
 					self.task = None
 				else: # Hash failed
 					self.manager.log.debug("%s: Hash failed: %s, failed peers: %s" % (self.key, task["inner_path"], len(task["failed"])))
-					task["failed"].append(self.key)
+					task["failed"].append(self.peer)
 					self.task = None
 					self.peer.hash_failed += 1
 					if self.peer.hash_failed >= 3: # Broken peer

src/Worker/WorkerManager.py

@@ -76,7 +76,7 @@ def getTask(self, peer):
 		self.tasks.sort(key=self.taskSorter, reverse=True) # Sort tasks by priority and worker numbers
 		for task in self.tasks: # Find a task
 			if task["peers"] and peer not in task["peers"]: continue # This peer not allowed to pick this task
-			if peer.key in task["failed"]: continue # Peer already tried to solve this, but failed
+			if peer in task["failed"]: continue # Peer already tried to solve this, but failed
 			return task
 
 
@@ -145,6 +145,12 @@ def addTask(self, inner_path, peer=None, priority = 0):
 				task["peers"].append(peer)
 				self.log.debug("Added peer %s to %s" % (peer.key, task["inner_path"]))
 				self.startWorkers([peer])
+			elif peer and peer in task["failed"]: 
+				task["failed"].remove(peer) # New update arrived, remove the peer from failed peers
+				self.log.debug("Removed peer %s from failed %s" % (peer.key, task["inner_path"]))
+				self.startWorkers([peer])
+
+
 			if priority: 
 				task["priority"] += priority # Boost on priority
 			return task["evt"]

src/util/Event.py

@@ -25,9 +25,26 @@ def once(self, func, name=None):
 		return self
 
 
-if __name__ == "__main__":
+
+
+def testBenchmark():
 	def say(pre, text):
 		print "%s Say: %s" % (pre, text)
+
+	import time
+	s = time.time()
+	onChanged = Event()
+	for i in range(1000):
+		onChanged.once(lambda pre: say(pre, "once"), "once")
+	print "Created 1000 once in %.3fs" % (time.time()-s)
+	onChanged("#1")
+
+
+
+def testUsage():
+	def say(pre, text):
+		print "%s Say: %s" % (pre, text)
+
 	onChanged = Event()
 	onChanged.once(lambda pre: say(pre, "once"))
 	onChanged.once(lambda pre: say(pre, "once"))
@@ -37,3 +54,7 @@ def say(pre, text):
 	onChanged("#1")
 	onChanged("#2")
 	onChanged("#3")
+
+
+if __name__ == "__main__":
+	testBenchmark()

src/util/Noparallel.py

@@ -1,5 +1,6 @@
 import gevent, time
 
+
 class Noparallel(object): # Only allow function running once in same time
 	def __init__(self,blocking=True):
 		self.threads = {}
@@ -30,24 +31,30 @@ def wrapper(*args, **kwargs):
 					if key in self.threads: del(self.threads[key]) # Allowing it to run again
 					return ret
 				else: # No blocking just return the thread
+					thread.link(lambda thread: self.cleanup(key, thread))
 					return thread
 		wrapper.func_name = func.func_name
 
 		return wrapper
 
+	# Cleanup finished threads
+	def cleanup(self, key, thread):
+		if key in self.threads: del(self.threads[key])
+
+
 class Test():
 	@Noparallel()
-	def count(self):
-		for i in range(5):
+	def count(self, num=5):
+		for i in range(num):
 			print self, i
 			time.sleep(1)
 		return "%s return:%s" % (self, i)
 
 
 class TestNoblock():
 	@Noparallel(blocking=False)
-	def count(self):
-		for i in range(5):
+	def count(self, num=5):
+		for i in range(num):
 			print self, i
 			time.sleep(1)
 		return "%s return:%s" % (self, i)
@@ -104,11 +111,33 @@ def testNoblocking():
 	print thread1.value, thread2.value, thread3.value, thread4.value
 	print "Done."
 
+
+def testBenchmark():
+	import time
+	def printThreadNum():
+		import gc
+		from greenlet import greenlet
+		objs = [obj for obj in gc.get_objects() if isinstance(obj, greenlet)]
+		print "Greenlets: %s" % len(objs)
+
+	printThreadNum()
+	test = TestNoblock()
+	s = time.time()
+	for i in range(3):
+		gevent.spawn(test.count, i+1)
+	print "Created in %.3fs" % (time.time()-s)
+	printThreadNum()
+	time.sleep(5)
+
+
+
 if __name__ == "__main__":
 	from gevent import monkey
 	monkey.patch_all()
 
+	testBenchmark()
 	print "Testing blocking mode..."
 	testBlocking()
 	print "Testing noblocking mode..."
 	testNoblocking()
+	print [instance.threads for instance in registry]