lib/scooter/httpdispatchers/classifier.rb in scooter-3.2.19 vs lib/scooter/httpdispatchers/classifier.rb in scooter-4.1.0
- old
+ new
@@ -298,23 +298,22 @@
# If we got this far, return the "model" hash.
node_group_model
end
# Used to compare replica classifier to master. Raises exception if it does not match.
- # @param [BeakerHost] host_name
- def classifier_database_matches_self?(host_name)
- original_host_name = self.host
+ # @param [String] host_name
+ def classifier_database_matches_self?(replica_host)
+ original_host_name = host.host_hash[:vmhostname]
begin
- self.host = host_name.to_s
- initialize_connection
+ host.host_hash[:vmhostname] = replica_host.hostname
+
other_nodes = get_list_of_nodes
other_classes = get_list_of_classes
other_environments = get_list_of_environments
other_groups = get_list_of_node_groups
ensure
- self.host = original_host_name
- initialize_connection
+ host.host_hash[:vmhostname] = original_host_name
end
self_nodes = get_list_of_nodes
self_classes = get_list_of_classes
self_environments = get_list_of_environments
@@ -329,10 +328,10 @@
errors << "Nodes do not match\r\n" unless nodes_match
errors << "Classes do not match\r\n" unless classes_match
errors << "Environments do not match\r\n" unless environments_match
errors << "Groups do not match\r\n" unless groups_match
- @faraday_logger.warn(errors.chomp) unless errors.empty?
+ host.logger.warn(errors.chomp) unless errors.empty?
errors.empty?
end
# Check to see if all nodes match between two query responses
# @param [Object] other_nodes - response from get_list_of_nodes