From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Dec 2008 23:03:51 +0000 (+0100)
Subject: Added some verbosity things to buildspy.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76bb443a6a0a5f0c8ba561cd380e1452f0983e88;p=ipfire.org.git

Added some verbosity things to buildspy.
---

diff --git a/build/builder.py b/build/builder.py
index 92ef9cb2..cf9387a2 100644
--- a/build/builder.py
+++ b/build/builder.py
@@ -112,6 +112,7 @@ class DatabaseConfig:
 		c.close()
 		self.data = value
 		self.db.commit()
+		return """Set "%s" to "%s".""" % (self.key, self.data,)
 
 class DurationsConfig:
 	def __init__(self, db):
@@ -138,6 +139,7 @@ class DurationsConfig:
 						"value" : value, })
 		c.close()
 		self.db.commit()
+		return """Accepted build duration of %s seconds.""" % (value,)
 
 	def get_avg(self):
 		sum = 0
@@ -202,6 +204,7 @@ class FileConfig:
 		for line in base64.b64decode(lines).split("\n"):
 			f.write("%s\n" % line.rstrip("\n"))
 		f.close()
+		return """Saved file content to %s.""" % (self.filename,)
 
 class Builder:
 	def __init__(self, config, uuid):
@@ -250,13 +253,13 @@ class Builder:
 			self.state.set("unknown")
 
 		# If host was longer than four weels in distcc state we delete it.
-		if self.state() == "unknown" and \
+		if self.state() in ("distcc", "unknown",) and \
 				(time.time() - self.state.time()) > 4*7*24*60*60:
 			del self.db
 			shutil.rmtree(self.path)
 
 	def set(self, key, value):
-		eval("self.%s.set(\"%s\")" % (key, value,))
+		return eval("self.%s.set(\"%s\")" % (key, value,))
 
 	def get(self, key):
 		return eval("self.%s.get()" % (key,))
diff --git a/build/rpc.py b/build/rpc.py
index d2930ca1..b08a0b3a 100644
--- a/build/rpc.py
+++ b/build/rpc.py
@@ -35,7 +35,7 @@ class Response:
 		self.config = config
 		
 		self.code = "200"
-		self.mesg = "OK"
+		self.mesg = ""
 	
 	def __call__(self, exit=0):
 		print "Status: %s" % self.code
@@ -50,6 +50,11 @@ class Response:
 	
 	def set_mesg(self, mesg):
 		self.mesg = mesg
+	
+	def write(self, s):
+		if self.mesg:
+			self.mesg += "\n"
+		self.mesg += "[%s] - %s" % (time.ctime(), s,)
 
 response = Response(config)
 
@@ -68,7 +73,9 @@ if action == "set":
 	key = None
 	for key in [ "distcc", "duration", "hostname", "jobs", "log", "state", "package", "target", "cpu", "machine" ]:
 		for value in data.getlist(key):
-			builder.set(key, value)
+			ret = builder.set(key, value)
+			if ret:
+				response.write(ret)
 elif action == "get":
 	for key in [ "distcc", ]:
 		if key == "distcc":