[Title] apply server_configs table

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Iafbadecaa66c548bcc25aae23ca69a8c28566072

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index e431b227071923636ee3beab100317ad60181d58..d1c159bb0f57b727e31ccc9304e46a688ceee196 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -431,7 +431,7 @@ class BuildServer
                db_version = nil
                begin
                        db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd)
-                       db_version = db.select_one("SELECT (version) FROM db")[0]
+                       db_version = db.select_one("SELECT (db_version) FROM server_configs")[0]
                rescue DBI::DatabaseError => e
                        #puts e.errstr
                ensure
@@ -445,7 +445,7 @@ class BuildServer
                create = false
                begin
                        db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd)
-                       db_version = db.select_one("SELECT (version) FROM db")[0]
+                       db_version = db.select_one("SELECT (db_version) FROM server_configs")[0]
                        if db_version.nil? then
                                create = true
                        else
@@ -534,8 +534,11 @@ class BuildServer
                        end
 
                        # create table
-                       db.do "CREATE TABLE db(version INTEGER )"
-                       db.do "INSERT INTO db (version) VALUES('#{@db_version}')"
+                       db.do "CREATE TABLE server_configs ( id INTEGER PRIMARY KEY, db_version INTEGER NOT NULL, max_working_job INTEGER NOT NULL,
+                                       send_mail VARCHAR(32) NOT NULL DEFAULT 'NO', job_keep_time INTEGER NOT NULL DEFAULT 86400, pkg_sync_period INTEGER NOT NULL DEFAULT 600,
+                                       changelog_check VARCHAR(32) NOT NULL DEFAULT 'FALSE', job_log_url VARCHAR(256) ) #{post_fix}"
+                       db.do "INSERT INTO server_configs (db_version,max_working_job,send_mail,job_keep_time,pkg_sync_period,changelog_check,job_log_url)
+                                       VALUES('#{@db_version}','#{@jobmgr.max_working_jobs}','#{@send_mail}','#{@keep_time}','#{@pkg_sync_period}','#{@changelog_check.to_s.upcase}','#{@job_log_url}')"
                        db.do "CREATE TABLE os_category ( id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32) NOT NULL UNIQUE ) #{post_fix}"
                        db.do "CREATE TABLE distributions(name VARCHAR(32) PRIMARY KEY, pkgsvr_url VARCHAR(256), pkgsvr_addr VARCHAR(64), status VARCHAR(32) DEFAULT 'OPEN')"
                        db.do "CREATE TABLE remote_build_servers ( id INTEGER PRIMARY KEY #{inc}, svr_addr VARCHAR(64) NOT NULL UNIQUE, description VARCHAR(256) )#{post_fix}"