From: donghee yang <donghee.yang@samsung.com>
Date: Mon, 8 Apr 2013 07:32:22 +0000 (+0900)
Subject: [Title] Removed code for unused "remote_log" file
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7abbc20b44b004a52a9f47af57b892c4df34f190;p=sdk%2Ftools%2Fsdk-build.git

[Title] Removed code for unused "remote_log" file
---

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index ffe7b0e..b30c75f 100644
--- 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 edd3acb..7076642 100644
--- 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 df893e4..3948901 100644
--- 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 7f6e320..ad8ddd2 100644
--- 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 5c56221..d5d5356 100644
--- 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 a105594..a3d5d87 100644
--- 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 dde9eb8..1e3d35a 100644
--- 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 505bde0..d3d8997 100644
--- 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!