[gentoo-commits] dev/zorry:master commit in: gobs/bin/, gobs/pym/

[Magnus Granberg]

commit:     a2502fc4a74dfd0aced82648ed3a7a4593a2a476
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 14:42:49 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 14:42:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=a2502fc4

adding updatedb to job host deamon

---
 gobs/bin/gobs_host_jobs                      |   28 +++++++++++++++++--------
 gobs/bin/{gobs_host_jobs => gobs_host_jobs~} |   28 +++++++++++++++++--------
 gobs/pym/pgsql.py                            |    6 ++--
 gobs/{bin/gobs_updatedb => pym/updatedb.py}  |   11 ++-------
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs
index e6e5ead..87e856e 100755
--- a/gobs/bin/gobs_host_jobs
+++ b/gobs/bin/gobs_host_jobs
@@ -6,6 +6,8 @@ from __future__ import print_function
 
 from gobs.init_setup_profile import setup_profile_main
 from gobs.readconf import get_conf_settings
+from gobs.updatedb import update_db_main
+
 reader = get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
 
@@ -15,31 +17,39 @@ CM=connectionManager(gobs_settings_dict)
 #selectively import the pgsql/mysql querys
 if CM.getName()=='pgsql':
 	from gobs.pgsql import *
-# import logging
+import logging
 
 def main():
 	# Main
 	config_profile = gobs_settings_dict['gobs_config']
 	# Logging
-	#logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
-	#	format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
-	conn = CM.getConnection()
-	CM.putConnection(conn)
+	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
+		format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
 	repeat = True
+	logging.info("Job deamon started.")
 	while repeat:
 		conn = CM.getConnection()
 		job = check_job_list(conn, config_profile)
-		print("job jobid:" + job)
+		
 		if job is None:
 			time.sleep(60)
 			CM.putConnection(conn)
 			continue
 		else:
-			update_job_list("Runing", job[1])
+			logging.info("Job: %s Type: %s Config: %s", job[1], job[0], config_profile)
+			if job[0] == "updatedb":
+				update_job_list(conn, "Runing", job[1])
+				logging.info("Job %s is runing. Config: %s", job[0], config_profile)
+				result = update_db_main()
+				if result is True
+					update_job_list(conn, "Done", job[1])
+					logging.info("Job %s is done. Config: %s", job[0], config_profile)
+				else:
+					update_job_list(conn, "Fail", job[1])
+					logging.info("Job %s did fail. Config: %s", job[0], config_profile)
 			repeat = False
 		CM.putConnection(conn)
 		time.sleep(60)
-	connectionManager.closeAllConnections()
-	
+
 if __name__ == "__main__":
 	main()
\ No newline at end of file

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs~
similarity index 54%
copy from gobs/bin/gobs_host_jobs
copy to gobs/bin/gobs_host_jobs~
index e6e5ead..87e856e 100755
--- a/gobs/bin/gobs_host_jobs
+++ b/gobs/bin/gobs_host_jobs~
@@ -6,6 +6,8 @@ from __future__ import print_function
 
 from gobs.init_setup_profile import setup_profile_main
 from gobs.readconf import get_conf_settings
+from gobs.updatedb import update_db_main
+
 reader = get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
 
@@ -15,31 +17,39 @@ CM=connectionManager(gobs_settings_dict)
 #selectively import the pgsql/mysql querys
 if CM.getName()=='pgsql':
 	from gobs.pgsql import *
-# import logging
+import logging
 
 def main():
 	# Main
 	config_profile = gobs_settings_dict['gobs_config']
 	# Logging
-	#logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
-	#	format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
-	conn = CM.getConnection()
-	CM.putConnection(conn)
+	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
+		format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
 	repeat = True
+	logging.info("Job deamon started.")
 	while repeat:
 		conn = CM.getConnection()
 		job = check_job_list(conn, config_profile)
-		print("job jobid:" + job)
+		
 		if job is None:
 			time.sleep(60)
 			CM.putConnection(conn)
 			continue
 		else:
-			update_job_list("Runing", job[1])
+			logging.info("Job: %s Type: %s Config: %s", job[1], job[0], config_profile)
+			if job[0] == "updatedb":
+				update_job_list(conn, "Runing", job[1])
+				logging.info("Job %s is runing. Config: %s", job[0], config_profile)
+				result = update_db_main()
+				if result is True
+					update_job_list(conn, "Done", job[1])
+					logging.info("Job %s is done. Config: %s", job[0], config_profile)
+				else:
+					update_job_list(conn, "Fail", job[1])
+					logging.info("Job %s did fail. Config: %s", job[0], config_profile)
 			repeat = False
 		CM.putConnection(conn)
 		time.sleep(60)
-	connectionManager.closeAllConnections()
-	
+
 if __name__ == "__main__":
 	main()
\ No newline at end of file

diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py
index 5ebe500..64f1b46 100644
--- a/gobs/pym/pgsql.py
+++ b/gobs/pym/pgsql.py
@@ -639,7 +639,7 @@ def make_conf_error(connection,config_profile):
 
 def check_job_list(connection, config_profile):
 	cursor = connection.cursor()
-	sqlQ1 = 'SELECT idnr FROM configs WHERE id = %s'
+	sqlQ1 = 'SELECT id_nr FROM configs WHERE id = %s'
 	sqlQ2 = "SELECT job, jobnr FROM jobs_list WHERE status = 'Waiting' AND config_id = %s"
 	cursor.execute(sqlQ1, (config_profile,))
 	config_nr = cursor.fetchone()
@@ -649,8 +649,8 @@ def check_job_list(connection, config_profile):
 		return None
 	return job
 	
-def update_job_list(status, jobid):
+def update_job_list(connection, status, jobid):
 	cursor = connection.cursor()
-	sqlQ = 'UPDATE  jobs_list SET ststus = %s WHERE jobid = %s'
+	sqlQ = 'UPDATE  jobs_list SET status = %s WHERE jobnr = %s'
 	cursor.execute(sqlQ, (status, jobid,))
 	connection.commit()

diff --git a/gobs/bin/gobs_updatedb b/gobs/pym/updatedb.py
similarity index 95%
rename from gobs/bin/gobs_updatedb
rename to gobs/pym/updatedb.py
index d7bfbee..738179f 100755
--- a/gobs/bin/gobs_updatedb
+++ b/gobs/pym/updatedb.py
@@ -1,10 +1,9 @@
-#!/usr/bin/python
 # Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """ 	This code will update the sql backend with needed info for
 	the Frontend and the Guest deamon. """
-
+from __future__ import print_function
 import sys
 import os
 import multiprocessing
@@ -110,11 +109,9 @@ def update_cpv_db(mysettings):
 	pool.join() 
 	logging.info("Checking categories, package and ebuilds done")
 
-def main():
+def update_db_main():
 	# Main
 	# Logging
-	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
-		format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
 	logging.info("Update db started.")
 	# Sync portage and profile/settings
 	git_pull
@@ -127,6 +124,4 @@ def main():
 	update_cpv_db(mysettings)
 	CM.closeAllConnections()
 	logging.info("Update db ... Done.")
-	
-if __name__ == "__main__":
-	main()
\ No newline at end of file
+	return True
\ No newline at end of file