[TITLE][Package server] using default server port

[DESC.] redmine #8727

Change-Id: Id547b17e6cd02dde2366f3003768d7b7ab27e8da

diff --git a/src/pkg_server/packageServer.rb b/src/pkg_server/packageServer.rb
index d7117975fc70cb78f30bbf01daa1e274bf496f95..47519fb2e8e6a1c3e18c74fc56bdc4b5a589ccd1 100644 (file)
--- a/src/pkg_server/packageServer.rb
+++ b/src/pkg_server/packageServer.rb
@@ -121,6 +121,7 @@ class PackageServer
                        f.puts "integrity check : #{@integrity}"
                        f.puts "auto sync : #{@auto_sync_flag}"
                        f.puts "sync interval : #{@sync_interval}"
+                       f.puts "server port : #{@port}"
                        f.puts "server_url : #{dist_name} ->  #{server_url}"
                end
 
@@ -131,6 +132,9 @@ class PackageServer
                Utils.file_unlock(lock_file)
 
                @log.output( "package server [#{@id}] created successfully", Log::LV_USER )
+               @log.output( " - server location : #{@location}", Log::LV_USER )
+               @log.output( " - server configure file : #{@config_file_path}", Log::LV_USER )
+               @log.output( " - default server port : #{@port}", Log::LV_USER )
        end
 
        def register( file_path_list, dist_name, snapshot, test_flag, internal_flag = false )
@@ -475,27 +479,34 @@ class PackageServer
        # start server daemon
        def start( port, passwd )
                @log.info "Package server Start..."
-               # set port number. default port is 3333
-               @port = port
+               # if user input exsist, set port number.
+               if (port != "") then
+                       # update server port information
+                       # config file
+                       original_string = "server port : #{@port}"
+                       replacement_string = "server port : #{port}"
+                       contents = File.read(@config_file_path).gsub("#{original_string}", "#{replacement_string}")
+                       File.open(@config_file_path, "w") { |f| f.puts contents }
+                       
+                       # global variable
+                       @port = port
+               end
+
+               # write package server port for server lock
+               File.open(@run_file_path, "w") { |f| f.puts @port }
 
-               # write package server port
-               File.open(@run_file_path, "w") do |f|
-                       f.puts @port
-               end
-               
                #lock the package server. Do not run the same server at the same time
-               if (not lockServer())
-    printErrorMessage("Server \"#{id}\" is already running.")    
-    return
+               if (not lockServer()) then
+                       printErrorMessage("Server \"#{id}\" is already running.")
+                       return
                end
                
                #check that the port is open
-  if BuildCommServer.port_open? port then
-    printErrorMessage("Port \"#{port}\" is already in use.")    
-    return
-  end
+               if BuildCommServer.port_open? port then
+                       printErrorMessage("Port \"#{port}\" is already in use.")
+                       return
+               end
                 
-
                # set job request listener
                @log.info "Setting listener..."
                listener = SocketRegisterListener.new(self)
@@ -662,6 +673,8 @@ class PackageServer
                                                @auto_sync_flag = l.split(" :")[1].strip.upcase
                                        elsif l.start_with?( "sync interval :" ) then
                                                @sync_interval = l.split(" :")[1].strip.to_i
+                                       elsif l.start_with?( "server port :" ) then
+                                               @port = l.split(" :")[1].strip.to_i
                                        elsif l.start_with?( "server_url :" ) then
                                                info = l.split(" :")[1].split("->")
                                                @dist_to_server_url[info[0].strip] = info[1].strip

diff --git a/src/pkg_server/serverOptParser.rb b/src/pkg_server/serverOptParser.rb
index 753a428f68717fcdd0ceec19abc4d2f3b3b65eec..cf142f78b52c6ee804da4f3d03ac00995c3dc9f4 100644 (file)
--- a/src/pkg_server/serverOptParser.rb
+++ b/src/pkg_server/serverOptParser.rb
@@ -38,7 +38,7 @@ def set_default( options )
        options[:pkgs] = []
        options[:snaps] = []
        options[:bsnap] = ""
-       options[:port] = "3333"
+       options[:port] = ""
        options[:gensnap] = true
        options[:force] = false
        options[:test] = false
@@ -88,9 +88,6 @@ def option_error_check( options )
                        raise ArgumentError, "Usage: pkg-svr gen-snapshot -n <server name> -d <distribution> -s <snapshot name> [-b <base snapshot name>]"
                end
        when "start"
-               if options[:port].empty? then
-                       raise ArgumentError, "Usage: pkg-svr start -n <server name> -p <port> [-w <password>]"
-               end
        when "stop"
        when "sync"
        when "list"