Only call after_update_* when something changed

Author: agrare

app/models/ext_management_system.rb

@@ -193,12 +193,12 @@ def edit_with_params(params, endpoints, authentications)
         endpoints_changed       ||= ems.endpoints.any?(&:changed?)
         authentications_changed ||= ems.authentications.any?(&:changed?)
 
-        after_update_endpoints      if endpoints_changed
-        after_update_authentication if authentications_changed
-
         ems.provider.save! if ems.provider.present? && ems.provider.changed?
         ems.save!
       end
+
+      after_update_endpoints      if endpoints_changed
+      after_update_authentication if authentications_changed
     end
   end
 
@@ -920,14 +920,14 @@ def stop_event_monitor_queue
   end
 
   def stop_event_monitor_queue_on_change
-    if event_monitor_class && !new_record? && default_endpoint.changed.include_any?("hostname", "ipaddress")
+    if event_monitor_class && !new_record?
       _log.info("EMS: [#{name}], Hostname or IP address has changed, stopping Event Monitor.  It will be restarted by the WorkerMonitor.")
       stop_event_monitor_queue
     end
   end
 
   def stop_event_monitor_queue_on_credential_change
-    if event_monitor_class && !new_record? && default_authentication&.changed?
+    if event_monitor_class && !new_record?
       _log.info("EMS: [#{name}], Credentials have changed, stopping Event Monitor.  It will be restarted by the WorkerMonitor.")
       stop_event_monitor_queue
     end

app/models/mixins/authentication_mixin.rb

@@ -186,7 +186,7 @@ def update_authentication(data, options = {})
     # Invoke before callback
     before_update_authentication if self.respond_to?(:before_update_authentication) && options[:save]
 
-    data.each_pair do |type, value|
+    authentication_changes = data.each_pair.map do |type, value|
       cred = authentication_type(type)
       current = {:new => nil, :old => nil}
 
@@ -243,11 +243,17 @@ def update_authentication(data, options = {})
       cred.auth_key        = value[:auth_key]
       cred.service_account = value[:service_account].presence
 
+      changes = {type => cred.changes} if cred.changed?
+
       cred.save if options[:save] && id
-    end
+
+      changes
+    end.compact
+
+    return if authentication_changes.blank? || !options[:save]
 
     # Invoke callback
-    after_update_authentication if self.respond_to?(:after_update_authentication) && options[:save]
+    after_update_authentication if respond_to?(:after_update_authentication)
   end
 
   def authentication_type(type)