[Title] Fixed timeout problem

diff --git a/package/changelog b/package/changelog
index 7e33b6994bc0bb7a991ea3745c8b9a5ae8f8bae7..695d5e6dc7f475221fd33c44748b0c288c5e5171 100644 (file)
--- 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 69ad3871f5a52341e8404a54a44e46f107704412..6938cd93a944410402dc8f42085a6650836187f6 100644 (file)
--- 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 a134040d1d71b26ad6de6a944188911a89c590d2..3326c4a966459f688d9d13ff4fd2d518a4ea57a8 100644 (file)
--- 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 7622c450f2286640f219e001c00ab99159bbb936..5a1644dd47d08fb0d68c60cceb8c08cb21b7e8a1 100644 (file)
--- 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