File pacemaker-attrd-consistent-attr-host-logging.patch of Package pacemaker.23975

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-attrd-consistent-attr-host-logging.patch of Package pacemaker.23975

commit 8548ebf1ccfa6ef160eab5651c48db85c7b71052
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Thu Jul 13 14:58:01 2017 -0500

Log: attrd: be consistent about attr/host logging
    
    Most log messages used attrname[hostname], but a few used hostname[attrname].
    The inconsistency goes way back, and humorously, d3aa945c flipped all uses
    while keeping the inconsistency.

Index: pacemaker-1.1.16+20170320.77ea74d/attrd/commands.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/attrd/commands.c
+++ pacemaker-1.1.16+20170320.77ea74d/attrd/commands.c
@@ -1120,7 +1120,7 @@ write_attribute(attribute_t *a)
         /* If the value's peer info does not correspond to a peer, ignore it */
         if (peer == NULL) {
             crm_notice("Update error (peer not found): %s[%s]=%s failed (host=%p)",
-                       v->nodename, a->id, v->current, peer);
+                       a->id, v->nodename, v->current, peer);
             continue;
         }
 
@@ -1140,12 +1140,12 @@ write_attribute(attribute_t *a)
         if (peer->uuid == NULL) {
             a->unknown_peer_uuids = TRUE;
             crm_notice("Update %s[%s]=%s postponed: unknown peer UUID, will retry if UUID is learned",
-                       v->nodename, a->id, v->current, peer);
+                       a->id, v->nodename, v->current, peer);
             continue;
         }
 
         /* Add this value to status update XML */
-        crm_debug("Update: %s[%s]=%s (%s %u %u %s)", v->nodename, a->id,
+        crm_debug("Update: %s[%s]=%s (%s %u %u %s)", a->id, v->nodename,
                   v->current, peer->uuid, peer->id, v->nodeid, peer->uname);
         build_update_element(xml_top, a, peer->uuid, v->current);
         cib_updates++;

Places

File pacemaker-attrd-consistent-attr-host-logging.patch of Package pacemaker.23975

Places