From: hyoun jiil <jiil.hyoun@samsung.com>
Date: Thu, 21 Mar 2013 07:14:56 +0000 (+0900)
Subject: [Title] sync server.cfg file and db server_configs
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=535eb289c484b054ab61f9f786b1c306a9dab02c;p=sdk%2Ftools%2Fsdk-build.git

[Title] sync server.cfg file and db server_configs
[Type] Enhancement
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#] 8803
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I8f57cc5e82c51a2e9e31d3a49256ad4c81386477
---

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 65753cc..0d4fbee 100644
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -122,7 +122,7 @@ class BuildServer
 
 	def send_mail=(mail)
 		get_db_connection() do |db|
-			db.do "UPDATE server_configs SET value = '#{mail}' WHERE property = 'send_mail'"
+			db.do "UPDATE server_configs SET value = '#{mail.strip}' WHERE property = 'send_mail'"
 		end
 	end
 
@@ -179,7 +179,7 @@ class BuildServer
 
 	def job_log_url=(url)
 		get_db_connection() do |db|
-			db.do "UPDATE server_configs SET value = '#{url}' WHERE property = 'job_log_url'"
+			db.do "UPDATE server_configs SET value = '#{url.strip}' WHERE property = 'job_log_url'"
 		end
 	end
 
@@ -197,6 +197,18 @@ class BuildServer
 		end
 	end
 
+	def save_id_to_db(id)
+		get_db_connection() do |db|
+			db.do "UPDATE server_configs SET value = '#{id.strip}' WHERE property = 'id'"
+		end
+	end
+
+	def save_path_to_db(path)
+		get_db_connection() do |db|
+			db.do "UPDATE server_configs SET value = '#{path.strip}' WHERE property = 'path'"
+		end
+	end
+
 	def db_inc
 		return (@db_dsn =~ /^Mysql/i) ? "AUTO_INCREMENT" : "AUTOINCREMENT"
 	end
diff --git a/src/build_server/BuildServerController.rb b/src/build_server/BuildServerController.rb
index 8a79443..97b595b 100644
--- a/src/build_server/BuildServerController.rb
+++ b/src/build_server/BuildServerController.rb
@@ -135,6 +135,8 @@ class BuildServerController
 
 		# start
 		server.port = port
+		server.save_id_to_db(server.id)
+		server.save_path_to_db(server.path)
 		server.start
 	end
 
@@ -904,6 +906,10 @@ class BuildServerController
 					db_user = l[idx,length].strip if not l[idx,length].strip.empty?
 				elsif l.start_with?("DB_PASSWORD=")
 					db_passwd = l[idx,length].strip if not l[idx,length].strip.empty?
+				elsif l.start_with?("ID=")
+					if not l[idx,length].strip.eql? id then
+						raise RuntimeError, "Server configuration FAILED: #{server_dir}/server.cfg: ID must be \"#{id}\""
+					end
 				else
 					next
 				end