[Title] Removed code for unused "remote_log" file

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index ffe7b0ec997122d48fbdc4ba3e81655fa0a01b1f..b30c75f887afdcccd2f0ed909fc84c517e4ac168 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -427,16 +427,10 @@ class BuildJob < CommonJob
        def get_log_url()
                # only when server support log url
                if @server.job_log_url.empty? then
-                       return "",""
+                       return ""
                end
 
-               url = "#{@server.job_log_url}/#{@id}/log"
-               # if remote, the file existence must be checked
-               if File.exist? "#{@job_root}/remote_log" then
-                       return url,"#{@server.job_log_url}/#{@id}/remote_log"
-               else
-                       return url,""
-               end
+               return "#{@server.job_log_url}/#{@id}/log"
        end
 
 
@@ -793,10 +787,6 @@ class BuildJob < CommonJob
                        FileUtils.mkdir_p outgoing_dir
                end
 
-               @log.info( "Copying log to #{outgoing_dir}", Log::LV_USER)
-               file = "#{@source_path}/../log"
-               FileUtils.ln(file, "#{outgoing_dir}/remote_log",:force => true)
-
                # copy result files, if not reverse build
                if not @is_rev_build_check_job then
                        return copy_result_files( outgoing_dir )
@@ -900,13 +890,10 @@ class BuildJob < CommonJob
        # write web url for log
        protected
        def write_log_url()
-               url,remote_url = get_log_url()
+               url = get_log_url()
                if not url.empty? then
                        @log.info( " ** Log1: #{url}", Log::LV_USER)
                end
-               if not remote_url.empty? then
-                       @log.info( " ** Log2: #{remote_url}", Log::LV_USER)
-               end
        end
 
 

diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb
index edd3acb8cebb77d31c0768f24b67beb690caa0b3..7076642e7b3e5b103cbe74f8ffd1ef7a5ad0ac30 100644 (file)
--- a/src/build_server/MultiBuildJob.rb
+++ b/src/build_server/MultiBuildJob.rb
@@ -337,10 +337,10 @@ class MultiBuildJob < CommonJob
        def get_log_url()
                # only when server support log url
                if @server.job_log_url.empty? then
-                       return "",""
+                       return ""
                end
 
-               return "#{@server.job_log_url}/#{@id}/log",""
+               return "#{@server.job_log_url}/#{@id}/log"
        end
 
        #
@@ -467,13 +467,10 @@ class MultiBuildJob < CommonJob
        # write web url for log
        private
        def write_log_url(job)
-               url,remote_url = job.get_log_url()
+               url = job.get_log_url()
                if not url.empty? then
                        @log.info( " ** Log1: #{url}", Log::LV_USER)
                end
-               if not remote_url.empty? then
-                       @log.info( " ** Log2: #{remote_url}", Log::LV_USER)
-               end
        end
 
 
@@ -485,10 +482,6 @@ class MultiBuildJob < CommonJob
                        FileUtils.mkdir_p outgoing_dir
                end
 
-               @log.info( "Copying log to #{outgoing_dir}", Log::LV_USER)
-               file = "#{@source_path}/../log"
-               FileUtils.ln(file, "#{outgoing_dir}/remote_log",:force => true)
-
                # copy result files, if not reverse build
                return copy_result_files( outgoing_dir )
        end

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index df893e4ef730768c4de440c655f6fe16d386621a..394890186adb6d82d979bf527d5f4e12b0845327 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -347,10 +347,10 @@ class RegisterPackageJob < CommonJob
        def get_log_url()
                # only when server support log url
                if @server.job_log_url.empty? then
-                       return "",""
+                       return ""
                end
 
-               return "#{@server.job_log_url}/#{@id}/log",""
+               return "#{@server.job_log_url}/#{@id}/log"
        end
 
        #

diff --git a/src/build_server/ReverseBuildChecker.rb b/src/build_server/ReverseBuildChecker.rb
index 7f6e3207425920f747607b01fc50fdaa5c6c3523..ad8ddd29bf8d158c44310892f092c28916823010 100644 (file)
--- a/src/build_server/ReverseBuildChecker.rb
+++ b/src/build_server/ReverseBuildChecker.rb
@@ -196,12 +196,9 @@ class ReverseBuildChecker
        # write web url for log
        private
        def self.write_log_url(log, job)
-               url,remote_url = job.get_log_url()
+               url = job.get_log_url()
                if not url.empty? then
                        log.info( " ** Log1: #{url}", Log::LV_USER)
                end
-               if not remote_url.empty? then
-                       log.info( " ** Log2: #{remote_url}", Log::LV_USER)
-               end
        end
 end

diff --git a/test/build-server.basic1/build-cli-33.testcase b/test/build-server.basic1/build-cli-33.testcase
index 5c56221bd154d4824826cb7a662534b073ed71dc..d5d535654288b8325e98ed1be421e18c58487afc 100644 (file)
--- a/test/build-server.basic1/build-cli-33.testcase
+++ b/test/build-server.basic1/build-cli-33.testcase
@@ -28,7 +28,6 @@ Info:  * Added new job for reverse-build ... testb(ubuntu-32)
 Info:  * Added new job for reverse-build ... testc(ubuntu-32)
 Info:  * Reverse-build OK ...
 Info:  * Reverse-build OK ...
-Info: Copying log to
 Info: Copying result files to
 Info:  *
 Info: Job is completed!

diff --git a/test/build-server.basic1/build-cli-34.testcase b/test/build-server.basic1/build-cli-34.testcase
index a105594856f25807c6d7698fa2f177b1042119b7..a3d5d87242f4f9271dabbee9d2f831525faf1073 100644 (file)
--- a/test/build-server.basic1/build-cli-34.testcase
+++ b/test/build-server.basic1/build-cli-34.testcase
@@ -14,7 +14,6 @@ Info:  * Sub-Job
 Info:  * Sub-Job
 Info:  * Sub-Job
 Info:  * Sub-Job
-Info: Copying log to
 Info: Copying result files to
 Info:  *
 Info:  *

diff --git a/test/build-server.multi-svr1/01.testcase b/test/build-server.multi-svr1/01.testcase
index dde9eb89249405b01ec7ffe9a53caa0a90f5f898..1e3d35a377d40ddb34f0b0c4914910d9ebb45476 100644 (file)
--- a/test/build-server.multi-svr1/01.testcase
+++ b/test/build-server.multi-svr1/01.testcase
@@ -27,7 +27,6 @@ Info: Make install...
 Info: Generatiing pkginfo.manifest...
 Info: Zipping...
 Info: Creating package file ... a_0.0.1_ubuntu-32.zip
-Info: Copying log to
 Info: Copying result files to
 Info:  *
 Info: Job is completed!

diff --git a/test/build-server.multi-svr1/02.testcase b/test/build-server.multi-svr1/02.testcase
index 505bde0caad9964254455680063cbe5f42e7a76b..d3d8997bc004a7111b5f0cddbb23fe98ef262ed8 100644 (file)
--- a/test/build-server.multi-svr1/02.testcase
+++ b/test/build-server.multi-svr1/02.testcase
@@ -31,7 +31,6 @@ Info: Make install...
 Info: Generatiing pkginfo.manifest...
 Info: Zipping...
 Info: Creating package file ... b_0.0.1_ubuntu-32.zip
-Info: Copying log to
 Info: Copying result files to
 Info:  *
 Info: Job is completed!