From: donghee yang <donghee.yang@samsung.com>
Date: Mon, 7 Oct 2013 22:43:05 +0000 (+0900)
Subject: [Title] Fixed timeout problem
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed97ea5264e54ee9dcb994ca20d787220b00f694;p=sdk%2Ftools%2Fsdk-build.git

[Title] Fixed timeout problem
---

diff --git a/package/changelog b/package/changelog
index 7e33b69..695d5e6 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.49
+- Fixed Timeout problem 
+== donghee yang <donghee.yang@samsung.com> 2013-10-08
 * 2.1.48
 - Fixed sdk-image name (TIZNE -> TIZEN)
 == jonghwan park <jonghwan2.park@samsung.com> 2013-09-12
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 69ad387..6938cd9 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.48
+Version :2.1.49
 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 : tizen-dibs-test
diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb
index a134040..3326c4a 100644
--- a/src/build_server/JobManager.rb
+++ b/src/build_server/JobManager.rb
@@ -353,18 +353,24 @@ class JobManager
 		@server.log.info "Creating thread for canceling the job \"#{job.id}\""
 		Thread.new do
 			begin
+				@server.log.info "Job-Cancel-Thread started! \"#{job.id}\""
+
 				# job cancel
 				job.cancel
 
 				# cancel finished
+				@server.log.info "Updating job status to CANCELED... \"#{job.id}\""
 				job.status = "CANCELED"
 				save_job_status(job)
 
 				# call terminate process for job
+				@server.log.info "Calling CALLBACK, terminate... \"#{job.id}\""
 				job.terminate
-			rescue => e
+			rescue Exception => e
 				@server.log.error e.message
 				@server.log.error e.backtrace.inspect
+			ensure
+				@server.log.info "Job-Cancel-Thread is finished! \"#{job.id}\""
 			end
 		end
 	end
diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index 7622c45..5a1644d 100644
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -29,7 +29,7 @@ Contributors:
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require "BuildComm.rb"
 require "BuildServerException.rb"
-
+require 'timeout'
 
 class SocketJobRequestListener
 
@@ -110,7 +110,15 @@ class SocketJobRequestListener
 	def handle_job_request( req )
 
 		# read request
-		req_line = req.gets
+		req_line = nil
+		begin
+			# Maximum response time from client is 10 sec
+			Timeout::timeout( 10 ) do 
+				req_line = req.gets()
+			end
+		rescue Timeout::Error
+			req_line = nil
+		end
 		if req_line.nil? then return end
 
 		# accept