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

[Magnus Granberg]

commit:     6505a65933a1091252d93d206d9a570dae82cc5b
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:51:11 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:51:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=6505a659

Code change for the host/config split

---
 gobs/bin/gobs_guest_jobs |    7 ++++---
 gobs/bin/gobs_host_jobs  |    7 ++++---
 gobs/pym/build_log.py    |   15 +++++++++------
 gobs/pym/mysql_querys.py |   18 +++++++++---------
 gobs/pym/package.py      |   13 ++++++-------
 gobs/pym/readconf.py     |    2 ++
 gobs/pym/sync.py         |   15 ++++++++++-----
 gobs/pym/updatedb.py     |   12 +++++++-----
 8 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/gobs/bin/gobs_guest_jobs b/gobs/bin/gobs_guest_jobs
index 2333d62..b97e7ed 100755
--- a/gobs/bin/gobs_guest_jobs
+++ b/gobs/bin/gobs_guest_jobs
@@ -19,16 +19,17 @@ def main():
 	repeat = True
 	reader = get_conf_settings()
 	gobs_settings_dict=reader.read_gobs_settings_all()
-	config_profile = gobs_settings_dict['gobs_config']
+	config = gobs_settings_dict['gobs_config']
+	hostname = gobs_settings_dict['hostname']
 	CM=connectionManager()
 	conn = CM.newConnection()
-	config_id = get_config_id(conn, config_profile)
+	config_id = get_config_id(conn, config, hostname)
 	add_gobs_logs(conn, "Job and build deamon started.", "info", config_id)
 	init_build_job = build_job_action(conn, config_id)
 	while repeat:
 		if not conn.is_connected() is True:
 			conn.reconnect(attempts=2, delay=1)
-		jobs_main(conn, config_profile)
+		jobs_main(conn, config)
 		if check_configure_guest(conn, config_id) is not True:
 			time.sleep(6)
 			continue

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs
index 162ac43..905d8af 100755
--- a/gobs/bin/gobs_host_jobs
+++ b/gobs/bin/gobs_host_jobs
@@ -13,14 +13,15 @@ def main():
 	# Main
 	reader = get_conf_settings()
 	gobs_settings_dict=reader.read_gobs_settings_all()
-	config_profile = gobs_settings_dict['gobs_config']
+	config = gobs_settings_dict['gobs_config']
+	hostname = gobs_settings_dict['hostname']
 	CM=connectionManager()
 	conn = CM.newConnection()
-	config_id = get_config_id(conn, config_profile)
+	config_id = get_config_id(conn, config, hostname)
 	add_gobs_logs(conn, "Job deamon started", "info", config_id)
 	repeat = True
 	while repeat:
-		jobs_main(conn, config_profile)
+		jobs_main(conn, config_id)
 		repeat = False
 		time.sleep(60)
 	conn.close

diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py
index 7b2fac4..3582406 100644
--- a/gobs/pym/build_log.py
+++ b/gobs/pym/build_log.py
@@ -216,8 +216,10 @@ def add_buildlog_process(settings, pkg):
 		conn.reconnect(attempts=2, delay=1)
 	reader=get_conf_settings()
 	gobs_settings_dict=reader.read_gobs_settings_all()
-	config_profile = gobs_settings_dict['gobs_config']
-	config_id = get_config_id(conn, config_profile)
+	config = gobs_settings_dict['gobs_config']
+	hostname =gobs_settings_dict['gobs_hostname']
+	host_config = hostname + "/" + config
+	config_id = get_config_id(conn, config, hostname)
 	build_dict = get_build_dict_db(conn, config_id, settings, pkg)
 	if build_dict is None:
 		log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,)
@@ -236,7 +238,7 @@ def add_buildlog_process(settings, pkg):
 			log_hash.update(log_line)
 	build_log_dict['build_error'] = build_error
 	build_log_dict['log_hash'] = log_hash.hexdigest()
-	build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(config_profile)[1]
+	build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
 	log_msg = "Logfile name: %s" % (settings.get("PORTAGE_LOG_FILE"),)
 	add_gobs_logs(conn, log_msg, "info", config_id)
 	log_id = add_new_buildlog(conn, build_dict, build_log_dict)
@@ -244,7 +246,7 @@ def add_buildlog_process(settings, pkg):
 	msg = ""
 	# emerge_info_logfilename = settings.get("PORTAGE_LOG_FILE")[:-3] + "emerge_log.log"
 	if log_id is None:
-		os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664)
+		# os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664)
 		log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,)
 		add_gobs_logs(conn, log_msg, "info", config_id)
 	else:
@@ -317,8 +319,9 @@ def log_fail_queru(conn, build_dict, settings):
 			else:
 				build_dict['build_useflags'] = None			
 			if settings.get("PORTAGE_LOG_FILE") is not None:
-				config_profile = get_config(conn, config_id)
-				build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(config_profile)[1]
+				hostname, config = get_config(conn, config_id)
+				host_config = hostname +"/" + config
+				build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
 				os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o224)
 			else:
 				build_log_dict['logfilename'] = ""

diff --git a/gobs/pym/mysql_querys.py b/gobs/pym/mysql_querys.py
index f179d26..3d9d495 100644
--- a/gobs/pym/mysql_querys.py
+++ b/gobs/pym/mysql_querys.py
@@ -1,10 +1,10 @@
 from __future__ import print_function
 
 # Queryes to add the logs
-def get_config_id(connection, config):
+def get_config_id(connection, config, host):
 	cursor = connection.cursor()
-	sqlQ = 'SELECT config_id FROM configs WHERE config = %s'
-	cursor.execute(sqlQ,(config,))
+	sqlQ = 'SELECT config_id FROM configs WHERE config = %s AND hostname= host'
+	cursor.execute(sqlQ,(config, host,))
 	entries = cursor.fetchone()
 	cursor.close()
 	if not entries is None:
@@ -69,11 +69,11 @@ def get_config_list_all(connection):
 
 def get_config(connection, config_id):
 	cursor = connection.cursor()
-	sqlQ ='SELECT config FROM configs WHERE config_id = %s'
+	sqlQ ='SELECT host, config FROM configs WHERE config_id = %s'
 	cursor.execute(sqlQ, (config_id,))
-	config = cursor.fetchone()
+	hostname, config = cursor.fetchone()
 	cursor.close()
-	return config[0]
+	return hostname[0], config[0]
 
 def update_make_conf(connection, configsDict):
 	cursor = connection.cursor()
@@ -85,11 +85,11 @@ def update_make_conf(connection, configsDict):
 
 def get_default_config(connection):
 	cursor = connection.cursor()
-	sqlQ = "SELECT config FROM configs WHERE default_config = 'True'"
+	sqlQ = "SELECT host, config FROM configs WHERE default_config = 'True'"
 	cursor.execute(sqlQ)
-	entries = cursor.fetchone()
+	hostname, config = cursor.fetchone()
 	cursor.close()
-	return entries[0]
+	return hostname[0], config[0]
 
 def get_repo_id(connection, repo):
 	cursor = connection.cursor()

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index 03b6c21..a86d512 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -12,7 +12,6 @@ from gobs.mysql_querys import get_config, get_config_id, add_gobs_logs, get_defa
 from gobs.readconf import get_conf_settings
 reader=get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
-config_profile = gobs_settings_dict['gobs_config']
 
 class gobs_package(object):
 
@@ -22,9 +21,9 @@ class gobs_package(object):
 		self._myportdb = myportdb
 		self._config_id = get_config_id(conn, config_profile)
 
-	def change_config(self, config_setup):
+	def change_config(self, host_config):
 		# Change config_root  config_setup = table config
-		my_new_setup = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_setup + "/"
+		my_new_setup = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + host_config + "/"
 		mysettings_setup = portage.config(config_root = my_new_setup)
 		return mysettings_setup
 
@@ -35,8 +34,8 @@ class gobs_package(object):
 		for config_id in config_id_list:
 
 			# Change config/setup
-			config_setup = get_config(self._conn, config_id)
-			mysettings_setup = self.change_config(config_setup)
+			hostname, config = get_config(self._conn, config_id)
+			mysettings_setup = self.change_config(hostname + "/" + config)
 			myportdb_setup = portage.portdbapi(mysettings=mysettings_setup)
 
 			# Get the latest cpv from portage with the config that we can build
@@ -155,10 +154,10 @@ class gobs_package(object):
 						add_new_build_job(self._conn, ebuild_id, config_id, use_flagsDict)
 
 						# B = Build cpv use-flags config
-						config_setup = get_config(self._conn, config_id)
+						hostname, config = get_config(self._conn, config_id)
 
 						# FIXME log_msg need a fix to log the use flags corect.
-						log_msg = "B %s:%s USE: %s %s" %  (k, v['repo'], use_flagsDict, config_setup,)
+						log_msg = "B %s:%s USE: %s %s:%s" %  (k, v['repo'], use_flagsDict, hostname, config,)
 						add_gobs_logs(self._conn, log_msg, "info", self._config_id)
 					i = i +1
 

diff --git a/gobs/pym/readconf.py b/gobs/pym/readconf.py
index 1a1c036..45ed10a 100644
--- a/gobs/pym/readconf.py
+++ b/gobs/pym/readconf.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import re
+import socket
 
 class get_conf_settings(object):
 # open the /etc/buildhost/buildhost.conf file and get the needed
@@ -45,5 +46,6 @@ class get_conf_settings(object):
 		gobs_settings_dict['sql_passwd'] = get_sql_passwd.rstrip('\n')
 		gobs_settings_dict['gobs_gitreponame'] = get_gobs_gitreponame.rstrip('\n')
 		gobs_settings_dict['gobs_config'] = get_gobs_config.rstrip('\n')
+		gobs_settings_dict['hostname'] = socket.gethostname()
 		# gobs_settings_dict['gobs_logfile'] = get_gobs_logfile.rstrip('\n')
 		return gobs_settings_dict

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py
index 085973a..3e25878 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py
@@ -3,17 +3,21 @@ import portage
 import os
 import errno
 import sys
+# Do not support python 3.*
 from git import *
+
 from _emerge.main import emerge_main
 from gobs.readconf import get_conf_settings
 from gobs.mysql_querys import get_config_id, add_gobs_logs, get_default_config
 
 reader=get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
-config_profile = gobs_settings_dict['gobs_config']
+_config = gobs_settings_dict['gobs_config']
+_hostname =gobs_settings_dict['gobs_hostname']
 
 def git_pull(conn):
-	config_id = get_config_id(conn, config_profile)
+	#FIXME: Use git direct so we can use python 3.*
+	config_id = get_config_id(conn, _config, _hostname)
 	log_msg = "Git pull"
 	add_gobs_logs(conn, log_msg, "info", config_id)
 	repo = Repo("/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/")
@@ -27,9 +31,10 @@ def git_pull(conn):
 	return True
 
 def sync_tree(conn):
-	config_id = get_config_id(conn, config_profile)
-	config_setup = get_default_config(conn)			# HostConfigDir = table configs id
-	default_config_root = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_setup + "/"
+	config_id = get_config_id(conn, _config, _hostname)
+	hostname, config = get_default_config(conn)			# HostConfigDir = table configs id
+	host_config = hostname +"/" + config
+	default_config_root = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + host_config + "/"
 	mysettings = portage.config(config_root = default_config_root)
 	tmpcmdline = []
 	tmpcmdline.append("--sync")

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py
old mode 100755
new mode 100644
index b33eb03..cc5681c
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py
@@ -17,7 +17,8 @@ from gobs.package import gobs_package
 from gobs.readconf import get_conf_settings
 reader = get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
-config_profile = gobs_settings_dict['gobs_config']
+_config = gobs_settings_dict['gobs_config']
+_hostname =gobs_settings_dict['gobs_hostname']
 
 def init_portage_settings(conn, config_id):
 	# check config setup
@@ -26,12 +27,13 @@ def init_portage_settings(conn, config_id):
 	add_gobs_logs(conn, log_msg, "info", config_id)
 	
 	# Get default config from the configs table  and default_config=1
-	config_setup = get_default_config(conn)		# HostConfigDir = table configs id
-	default_config_root = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_setup + "/"
+	hostname, config = get_default_config(conn)		# HostConfigDir = table configs id
+	host_config = hostname +"/" + config
+	default_config_root = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + host_config + "/"
 
 	# Set config_root (PORTAGE_CONFIGROOT)  to default_config_root
 	mysettings = portage.config(config_root = default_config_root)
-	log_msg = "Setting default config to: %s" % (config_setup,)
+	log_msg = "Setting default config to: %s" % (host_config,)
 	add_gobs_logs(conn, log_msg, "info", config_id)
 	return mysettings
 
@@ -116,7 +118,7 @@ def update_db_main(conn):
 	# Main
 
 	# Logging
-	config_id = get_config_id(conn, config_profile)
+	config_id = get_config_id(conn, _config, _hostname)
 	log_msg = "Update db started."
 	add_gobs_logs(conn, log_msg, "info", config_id)