|
 |
7ebc05 |
commit 4cf4c0dee7128ae0896bf5fc6cbaeffd21cfb984
|
|
|
7ebc05 |
Author: Andrew Beekhof <andrew@beekhof.net>
|
|
|
7ebc05 |
Date: Thu Apr 10 13:20:20 2014 +1000
|
|
|
7ebc05 |
|
|
|
7ebc05 |
Log: crmd: device isn't hooked up yet, don't bother logging it
|
|
|
7ebc05 |
|
|
|
7ebc05 |
(cherry picked from commit 97705f05e96dcc0f8b232f32b842ee36844a6567)
|
|
|
7ebc05 |
|
|
|
7ebc05 |
diff --git a/crmd/te_utils.c b/crmd/te_utils.c
|
|
|
7ebc05 |
index b2003ba..c7260fd 100644
|
|
|
7ebc05 |
--- a/crmd/te_utils.c
|
|
|
7ebc05 |
+++ b/crmd/te_utils.c
|
|
|
7ebc05 |
@@ -124,20 +124,20 @@ tengine_stonith_notify(stonith_t * st, stonith_event_t * st_event)
|
|
|
7ebc05 |
}
|
|
|
7ebc05 |
|
|
|
7ebc05 |
if (st_event->result == pcmk_ok && safe_str_eq("on", st_event->action)) {
|
|
|
7ebc05 |
- crm_notice("%s was successfully unfenced by %s (at the request of %s) with %s",
|
|
|
7ebc05 |
- st_event->target, st_event->executioner, st_event->origin,
|
|
|
7ebc05 |
- st_event->device); /* TODO: Why is device never set? */
|
|
|
7ebc05 |
+ crm_notice("%s was successfully unfenced by %s (at the request of %s)",
|
|
|
7ebc05 |
+ st_event->target, st_event->executioner, st_event->origin);
|
|
|
7ebc05 |
+ /* TODO: Hook up st_event->device */
|
|
|
7ebc05 |
return;
|
|
|
7ebc05 |
|
|
|
7ebc05 |
} else if (safe_str_eq("on", st_event->action)) {
|
|
|
7ebc05 |
- crm_err("Unfencing of %s by %s with %s failed: %s (%d)",
|
|
|
7ebc05 |
- st_event->target, st_event->executioner, st_event->device,
|
|
|
7ebc05 |
+ crm_err("Unfencing of %s by %s failed: %s (%d)",
|
|
|
7ebc05 |
+ st_event->target, st_event->executioner,
|
|
|
7ebc05 |
pcmk_strerror(st_event->result), st_event->result);
|
|
|
7ebc05 |
return;
|
|
|
7ebc05 |
|
|
|
7ebc05 |
} else if (st_event->result == pcmk_ok && crm_str_eq(st_event->target, fsa_our_uname, TRUE)) {
|
|
|
7ebc05 |
- crm_crit("We were alegedly just fenced by %s for %s with %s!", st_event->executioner,
|
|
|
7ebc05 |
- st_event->origin, st_event->device); /* Dumps blackbox if enabled */
|
|
|
7ebc05 |
+ crm_crit("We were alegedly just fenced by %s for %s!",
|
|
|
7ebc05 |
+ st_event->executioner, st_event->origin); /* Dumps blackbox if enabled */
|
|
|
7ebc05 |
|
|
|
7ebc05 |
qb_log_fini(); /* Try to get the above log message to disk - somehow */
|
|
|
7ebc05 |
|