lib/fulmar/infrastructure/service/transfer/base.rb in fulmar-1.4.0 vs lib/fulmar/infrastructure/service/transfer/base.rb in fulmar-1.4.1
- old
+ new
@@ -16,11 +16,13 @@
type: :rsync_with_versions
}
attr_accessor :config
+ # @param [Fulmar::Domain::Service::ConfigurationService] config
def initialize(config)
- @config = DEFAULT_CONFIG.merge(config)
+ @config = config
+ @config.merge(DEFAULT_CONFIG)
# Remove trailing slashes
@config[:local_path] = @config[:local_path].chomp('/') if @config[:local_path]
@config[:remote_path] = @config[:remote_path].chomp('/') if @config[:remote_path]