From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Oct 2017 11:03:31 +0000 (+0000)
Subject: jobs: Drop update_message()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ed118dab40292194e2eccfa1581d85c8631c112;p=pbs.git

jobs: Drop update_message()

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 0fce4deb..ae19952b 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -594,9 +594,6 @@ class Build(base.DataObject):
 		if self.pkg and self.pkg.commit:
 			return self.pkg.commit
 
-	def update_message(self, message):
-		self._set_attribute("message", message)
-
 	def has_perm(self, user):
 		"""
 			Check, if the given user has the right to perform administrative
diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index b0fb12eb..a500a208 100644
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -290,7 +290,7 @@ class Job(base.DataObject):
 				self.log("state_change", state=state, user=user)
 
 		# Always clear the message when the status is changed.
-		self.update_message(None)
+		self.message = None
 
 		# Update some more informations.
 		if state == "dispatching":
@@ -314,13 +314,12 @@ class Job(base.DataObject):
 	state = property(get_state, set_state)
 
 	def set_message(self, message):
-		self._set_attribute("message", "%s" % message)
+		if message:
+			message = "%s" % message
 
-	message = property(lambda s: s.data.message, set_message)
+		self._set_attribute("message", message)
 
-	# XXX DEPRECATED
-	def update_message(self, message):
-		self.message = message
+	message = property(lambda s: s.data.message, set_message)
 
 	def get_builder(self):
 		if self.data.builder_id:
@@ -660,7 +659,7 @@ class Job(base.DataObject):
 		# Catch dependency errors and log the problem string.
 		except DependencyError, e:
 			self.dependency_check_succeeded = False
-			self.update_message("%s" % e)
+			self.message = e
 
 		# The dependency check has succeeded
 		else:
diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index 89512a05..77b0136f 100644
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -553,10 +553,9 @@ class BuildersJobsStateHandler(BuildersBaseHandler):
 			raise tornado.web.HTTPError(403, "Altering another builder's build.")
 
 		# Save information to database.
-		job.state = state
-
-		message = self.get_argument("message", None)
-		job.update_message(message)
+		with self.db.transaction():
+			job.state = state
+			job.message = self.get_argument("message", None)
 
 		self.finish("OK")