[Title]Add error message

[Desc.]
* Show the error message if you use a port number that is being used
[Issue] #8389

Change-Id: If4ed3f803cf1003d1908b32a5f047616a09d00d3

diff --git a/build-svr b/build-svr
index 12306e94e030fc69d2102481c057ebc3a6cf8f88..51953b1e7467ffb73c1ab2f8ae44f43d2784ba41 100755 (executable)
--- 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 60b332bc89699fa36e9cc7d03b48091789b24e12..ef1e1e3f603847c361aaa03418906c04f67fe916 100644 (file)
--- 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 b9e92c30ca7c08154b1d862b22bccad4acb92541..0d95064a7f23d31c8aa78d90805983bb8045af3d 100644 (file)
--- 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..."