From 1bfbc2c81abc58a55ce68b89427a9c94ee3a1193 Mon Sep 17 00:00:00 2001 From: "donghyuk.yang" Date: Thu, 23 Aug 2012 15:28:35 +0900 Subject: [PATCH] [Title]Do not set timeout when waiting success message for uploading package [Type] [Module] [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- src/build_server/BuildComm.rb | 12 ++++++++---- src/pkg_server/client.rb | 2 +- src/pkg_server/installer.rb | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/build_server/BuildComm.rb b/src/build_server/BuildComm.rb index 4b8e02b..7d28272 100644 --- a/src/build_server/BuildComm.rb +++ b/src/build_server/BuildComm.rb @@ -356,14 +356,18 @@ class BuildCommClient # handle - def read_lines + def read_lines(enable_timeout = true) begin # get first line l = nil - timeout(5) do - l = @socket.gets() - end + if enable_timeout then + timeout(5) do + l = @socket.gets() + end + else + l = @socket.gets() + end if l.nil? then return false diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb index 75a0480..7b74d00 100644 --- a/src/pkg_server/client.rb +++ b/src/pkg_server/client.rb @@ -373,7 +373,7 @@ class Client @log.info "Send register message.. [REGISTER|#{dist}|#{binary_list.join("|")}]" snapshot = nil if client.send "REGISTER|#{dist}|#{binary_list.join("|")}" then - output = client.read_lines do |l| + output = client.read_lines(false) do |l| line = l.split("|") if line[0].strip == "ERROR" then @log.error l.strip diff --git a/src/pkg_server/installer.rb b/src/pkg_server/installer.rb index 86e6b47..5c67902 100644 --- a/src/pkg_server/installer.rb +++ b/src/pkg_server/installer.rb @@ -71,7 +71,7 @@ class FileInstaller log = log + "##### extract file : #{package_file_path} #####\n" log = log + extract_file(package_name, package_file_path, path, target_path, logger) if not move_dir(package_name, path, target_path, logger) then - Utils.execute_shell("rm -rf #{path}") + #Utils.execute_shell("rm -rf #{path}") return false end -- 2.34.1