[Title] Fixed PackageSync for multi distribution

diff --git a/src/build_server/BuildServerOptionParser.rb b/src/build_server/BuildServerOptionParser.rb
index b9bb76c4534db06eb6d35379d449fb342a872d64..f385807d450482e19c9652e71fa5e7deeb225138 100644 (file)
--- a/src/build_server/BuildServerOptionParser.rb
+++ b/src/build_server/BuildServerOptionParser.rb
@@ -221,11 +221,6 @@ def option_parse
             options[:url] = url 
         end
 
-        options[:proxy] = nil
-               opts.on( '--proxy <proxy url>', 'proxy url: http://172.21.111.100:2222' ) do|proxy|
-            options[:proxy] = proxy
-        end
-
                opts.on( '-d', '--address <server address>', 'server address: 127.0.0.1:2224' ) do|domain|
             options[:domain] = domain
         end

diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb
index f008f4fc96432e0ae3946e585933c903a94093fd..c3bd3fdd8788cf34d6ea9c1774d3819f9725c54e 100644 (file)
--- a/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@ -38,15 +38,14 @@ require "ScheduledActionHandler.rb"
 class PackageSyncAction < Action
        @@new_id = 0
        
-       def initialize( time, url, proxy, server, dist_name = "BASE" )
+       def initialize( time, url, dist_name, server )
                super(time, server.pkg_sync_period)
                my_id = @@new_id
                @@new_id += 1
                @pkgsvr_url = url
-               @proxy = proxy
+               @dist_name = dist_name
                @server = server
                @pkgsvr_client = nil
-               @dist_name = dist_name
                @main_client = nil
                @sync_root = "#{@server.path}/sync/#{my_id}"
                @download_path = "#{@sync_root}/remote"
@@ -179,9 +178,9 @@ class PackageServerSynchronizer
 
                time = Time.new + 60
                @server.remote_pkg_servers.each { |entry|
-                       url=entry[0]; proxy=entry[1]
-                       @handler.register( PackageSyncAction.new(time, url, proxy, @server) )
-                       @server.log.info "Registered package-sync action for server \"#{url}\""
+                       url=entry[0]; dist_name=entry[1]
+                       @handler.register( PackageSyncAction.new(time, url, dist_name, @server) )
+                       @server.log.info "Registered package-sync action!: #{dist_name} <= \"#{url}\""
                }
 
                # start handler