From 0094d2087b802a9dba871e932110d29cbb6de38a Mon Sep 17 00:00:00 2001
From: "shihyun.kim" <shihyun.kim@samsung.com>
Date: Wed, 3 Apr 2013 14:30:38 +0900
Subject: [PATCH] [Title]Add error message [Desc.] * Show the error message if
 you use a port number that is being used [Issue] #8389

Change-Id: If4ed3f803cf1003d1908b32a5f047616a09d00d3
---
 build-svr                       |  8 ++++++--
 src/build_server/BuildServer.rb | 12 ++++++++++++
 src/pkg_server/packageServer.rb | 13 +++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/build-svr b/build-svr
index 12306e9..51953b1 100755
--- a/build-svr
+++ b/build-svr
@@ -84,10 +84,13 @@ begin
 			log = Log.new( "#{BuildServer::CONFIG_ROOT}/#{option[:name]}/main.log" )
 			begin
 				while(true)
-					log.info "Build Server[#{option[:name]}] Start - PORT:[#{option[:port]}]"
+					log.info "Build Server[#{option[:name]}] Start - PORT: [#{option[:port]}]"
 					# Start child process
 					cmd = Utils.generate_shell_command("#{File.dirname(__FILE__)}/build-svr start -n #{option[:name]} -p #{option[:port]} --CHILD")
-					IO.popen(cmd)
+					
+					io = IO.popen(cmd) 
+				 puts io.readlines()
+				
 					pid = Process.wait
 
 					# End chlid process
@@ -114,6 +117,7 @@ begin
 						log.info "Down Build Server for DIBS upgrade."
 						break
 					else
+					  log.error("Exit value : #{$?.exitstatus}")
 						log.error "Down Build Server. Try reboot Build Server."
 					end
 				end
diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 60b332b..ef1e1e3 100644
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -236,6 +236,18 @@ class BuildServer
 
 		# init transport path
 		if not File.exist? @transport_path then FileUtils.mkdir_p @transport_path end
+		  
+  #check that the port is open
+  if BuildCommServer.port_open? port then
+    errMsg = "Port \"#{port}\" is already in use."
+    @log.info "Server creation failed"
+    @log.error errMsg
+    
+    puts "Server creation failed"
+    puts errMsg
+    
+    return
+  end
 
 		# init project mgr
 		@log.info "Setting Project Manager..."
diff --git a/src/pkg_server/packageServer.rb b/src/pkg_server/packageServer.rb
index b9e92c3..0d95064 100644
--- a/src/pkg_server/packageServer.rb
+++ b/src/pkg_server/packageServer.rb
@@ -481,6 +481,19 @@ class PackageServer
 		File.open(@run_file_path, "w") do |f|
 			f.puts @port
 		end
+		
+		#check that the port is open
+  if BuildCommServer.port_open? port then
+    errMsg = "Port \"#{port}\" is already in use."
+    @log.info "Server creation failed"
+    @log.error errMsg
+    
+    puts "Server creation failed"
+    puts errMsg
+    
+    return
+  end
+		 
 
 		# set job request listener
 		@log.info "Setting listener..."
-- 
2.34.1