[Title] // add logging in build-server main process, upgrade:

[Type]      //
[Module]    //
[Priority]  //
[CQ#]       //
[Redmine#]  //
[Problem]   //
[Cause]     //
[Solution]  //
[TestCase]  //

diff --git a/build-svr b/build-svr
index 3a3e458eedb9dc5c72833767ff6cf95980e6790e..176ef4e9c02f21f8ab5ddcf22c4c3d0bb8b28f8c 100755 (executable)
--- a/build-svr
+++ b/build-svr
@@ -32,6 +32,7 @@ require 'fileutils'
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/src/common"
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/src/build_server"
 require "utils"
+require "log.rb"
 require "BuildServerOptionParser"
 require "BuildServerController"
 
@@ -84,6 +85,7 @@ begin
                if( option[:child] ) then # Child Process
                        BuildServerController.start_server( option[:name], option[:port] ) 
                else  # Parent Process
+                       log = Log.new( "#{BuildServer::CONFIG_ROOT}/#{option[:name]}/main.log" )
                        while(true)
                                # Start child process
                                cmd = Utils.execute_shell_generate("#{File.dirname(__FILE__)}/build-svr start -n #{option[:name]} -p #{option[:port]} --CHILD")
@@ -91,18 +93,18 @@ begin
                                pid = Process.wait
 
                                # End chlid process
-                               puts "Child terminated, pid = # #{pid}, status = #{$?.exitstatus}"
+                               log.info "Child terminated, pid = # #{pid}, status = #{$?.exitstatus}"
                                if ($?.exitstatus == 0) then # SERVER STOP COMMAND
                                        break
                                elsif ($?.exitstatus == 99) then # DIBS UPGRADE
-                                       puts "Down Build Server for DIBS upgrade. [STATUS:#{$?.exitstatus}]"
+                                       log.info "Down Build Server for DIBS upgrade. [STATUS:#{$?.exitstatus}]"
                                        cmd = "#{File.dirname(__FILE__)}/upgrade -l #{File.dirname(__FILE__)} -S -t BUILDSERVER -n #{option[:name]} -p #{option[:port]}" 
                                        cmd = Utils.execute_shell_generate(cmd)
                                        puts cmd
                                        Utils.spawn(cmd)
                                        break
                                else
-                                       puts "Down Build Server. Try reboot Build Server.[STATUS:#{$?.exitstatus}]"
+                                       log.error "Down Build Server. Try reboot Build Server.[STATUS:#{$?.exitstatus}]"
                                end
                        end
                end

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 11733915c4fa87485459854d61bb3ffed8825924..f85a7c250ed0bfb777d97e3fb14d83cde3ccc11c 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :0.99.21
+Version :0.99.22
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs

diff --git a/upgrade b/upgrade
index 28887bc6118a30507375b619729e58489eb78b61..0abf9778714ffc124d3c143da838a2c22b325e24 100755 (executable)
--- a/upgrade
+++ b/upgrade
@@ -33,6 +33,7 @@ require 'optparse'
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/src/common"
 $LOAD_PATH.unshift File.dirname(__FILE__)+"/src/build_server"
 require "utils.rb"
+require "log.rb"
 require "BuildServerController"
 
 def option_error_check( options )
@@ -125,6 +126,7 @@ begin
        BUILD_CONFIG_ROOT = "#{Utils::HOME}/.build_tools/build_server/#{svr_name}"
        BUILD_FRIENDS_FILE = "#{BUILD_CONFIG_ROOT}/friends"
 
+       log = Log.new( "#{BACKUP_ROOT}/log" )
 
        if not install_opt then
                # Backup current dibs
@@ -132,7 +134,7 @@ begin
                FileUtils.mkdir_p(PREV_VER_PATH)
                FileUtils.mkdir_p(NEW_VER_PATH)
                FileUtils.cp_r("#{dibs_path}/.", PREV_VER_PATH, :preserve => true)
-               puts "Backup DIBS [#{dibs_path}] -> [#{PREV_VER_PATH}]"
+               log.info "Backup DIBS [#{dibs_path}] -> [#{PREV_VER_PATH}]"
 
                # Run Upgrade
                if start_opt then
@@ -142,7 +144,7 @@ begin
                end
 
                cmd = Utils.execute_shell_generate(cmd)
-               puts cmd
+               log.info cmd
                Utils.spawn(cmd)
 
        else
@@ -153,7 +155,7 @@ begin
                end
 
                # Download DIBS Package
-       client = Client.new( pkg_svr_url, NEW_VER_PATH, nil )
+       client = Client.new( pkg_svr_url, NEW_VER_PATH, log)
        client.update()
                client.install( DIBS_PKG_NAME, Utils::HOST_OS, true, true) 
 
@@ -165,7 +167,7 @@ begin
                if File.exist? "#{NEW_VER_PATH}/tools/dibs" then
                        FileUtils.cp_r("#{NEW_VER_PATH}/tools/dibs/.", "#{dibs_path}", :preserve => true)
                else
-                       puts "Not installed package error."
+                       log.error "Not installed package error."
                        exit(1)
                end
 
@@ -184,7 +186,7 @@ begin
                
                                                build_client = BuildCommClient.create( ip, port )
                                                if build_client.nil? then
-                                                       puts "Friend Server #{ip}:#{port} is not running!"
+                                                       log.info "Friend Server #{ip}:#{port} is not running!"
                                                        next    
                                                end
 
@@ -193,15 +195,15 @@ begin
                                                        # recevie & print
                                                        mismatched = false
                                                        result = build_client.read_lines do |l|
-                                                               puts l
+                                                               log.error l
                                                                if l.include? "Password mismatched!" then
                                                                        mismatched = true
                                                                end
                                                        end
                                                        if result and not mismatched then
-                                                               puts "Friend Server #{ip}:#{port} upgrade failed!"
+                                                               log.info "Friend Server #{ip}:#{port} upgrade failed!"
                                                        else
-                                                               puts "Friend Server #{ip}:#{port} upgrade requested!"
+                                                               log.info "Friend Server #{ip}:#{port} upgrade requested!"
                                                        end
                                                end
                
@@ -210,23 +212,21 @@ begin
                                        end
                                end
                        else
-                               puts "No Friend Server."
+                               log.info "No Friend Server."
                        end             
 
                        # Start Build server
                        cmd = Utils.execute_shell_generate("#{dibs_path}/build-svr start -n #{svr_name} -p #{svr_port}")
-                       #IO.popen(cmd)
                        Utils.spawn(cmd)
 
                else # PACKAGE SERVER
                        # Start Build server
                        cmd = Utils.execute_shell_generate("#{dibs_path}/pkg-svr start -n #{svr_name} -p #{svr_port}")
-                       #IO.popen("#{dibs_path}/pkg-svr start -n #{svr_name} -p #{svr_port}")
                        Utils.spawn(cmd)
                end
-       puts "Upgrade Complete"
+       log.info "Upgrade Complete"
        end
 rescue => e
-       puts e.message
+       log.info e.message
 end