diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:45:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:45:40 +0000 |
| commit | 07d7f4cfa4b10de87a31b68191036ff446add675 (patch) | |
| tree | 7162524d8aaf1aef62d2f4fa51f595ed113981ff /tools/crm_mon.c | |
| parent | Adding upstream version 2.1.6. (diff) | |
| download | pacemaker-07d7f4cfa4b10de87a31b68191036ff446add675.tar.xz pacemaker-07d7f4cfa4b10de87a31b68191036ff446add675.zip | |
Adding upstream version 2.1.7.upstream/2.1.7
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/crm_mon.c')
| -rw-r--r-- | tools/crm_mon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/crm_mon.c b/tools/crm_mon.c index c20766c..dbe76fc 100644 --- a/tools/crm_mon.c +++ b/tools/crm_mon.c @@ -1780,7 +1780,7 @@ send_custom_trap(const char *node, const char *rsc, const char *task, int target pid = fork(); if (pid == -1) { - crm_perror(LOG_ERR, "notification fork() failed."); + out->err(out, "notification fork() failed: %s", strerror(errno)); } if (pid == 0) { /* crm_debug("notification: I am the child. Executing the nofitication program."); */ @@ -1840,7 +1840,7 @@ handle_rsc_op(xmlNode *xml, void *userdata) node = crm_element_value(rsc_op, XML_LRM_ATTR_TARGET); - while (n != NULL && !pcmk__str_eq(XML_CIB_TAG_STATE, TYPE(n), pcmk__str_casei)) { + while ((n != NULL) && !pcmk__xe_is(n, XML_CIB_TAG_STATE)) { n = n->parent; } @@ -2051,7 +2051,7 @@ crm_diff_update(const char *event, xmlNode * msg) if (options.external_agent) { int format = 0; - crm_element_value_int(diff, "format", &format); + crm_element_value_int(diff, PCMK_XA_FORMAT, &format); switch(format) { case 1: crm_diff_update_v1(event, msg); |