[Title] Fixed a bug about remote server status
authordonghee yang <donghee.yang@samsung.com>
Wed, 12 Dec 2012 15:51:21 +0000 (00:51 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Wed, 12 Dec 2012 15:51:21 +0000 (00:51 +0900)
src/build_server/RemoteBuildServer.rb

index d643e1e6976a4306444a8b3e4a6f5f641859bfd1..934b5f740571585011823affc5af335d167f72f2 100644 (file)
@@ -200,7 +200,7 @@ class RemoteBuildServer
 
        def self.load(ip, port, db)
                saddr="#{ip}:#{port}"
-               row = db.select_one("SELECT * FROM remote_build_servers WHERE svr_addr='#{saddr}'")
+               row = db.select_one("SELECT remote_build_servers.*,supported_os.name as host_os_name FROM remote_build_servers, supported_os WHERE svr_addr='#{saddr}' and remote_build_servers.supported_os_id = supported_os.id")
                if not row.nil? then
                        return load_row(row)
                end
@@ -228,7 +228,7 @@ class RemoteBuildServer
                new_obj.max_working_jobs =row['max_job_count']
                new_obj.working_job_count =row['working_job_count']
                new_obj.waiting_job_count =row['waiting_job_count']
-
+               new_obj.host_os = row['host_os_name']
                return new_obj
        end