projects / packages / pacemaker.git / blame
| Commit | Line | Data |
|---|---|---|
| 650f9adf JB |
1 | --- pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c.orig 2013-07-26 02:02:31.000000000 +0200 |
| 2 | +++ pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c 2013-09-07 22:08:44.162036132 +0200 | |
| 3 | @@ -31,13 +31,13 @@ | |
| 4 | #include <crm/common/util.h> | |
| 5 | #include <crm_internal.h> | |
| 6 | ||
| 7 | -typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS; | |
| 8 | +typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS_T; | |
| 9 | ||
| 10 | -const char *status2char(STATUS status); | |
| 11 | -STATUS event2status(struct sl_event *event); | |
| 12 | +const char *status2char(STATUS_T status); | |
| 13 | +STATUS_T event2status(struct sl_event *event); | |
| 14 | ||
| 15 | const char * | |
| 16 | -status2char(STATUS status) | |
| 17 | +status2char(STATUS_T status) | |
| 18 | { | |
| 19 | switch (status) { | |
| 20 | default: | |
| 21 | @@ -50,10 +50,10 @@ | |
| 22 | } | |
| 23 | } | |
| 24 | ||
| 25 | -STATUS | |
| 26 | +STATUS_T | |
| 27 | event2status(struct sl_event * event) | |
| 28 | { | |
| 29 | - STATUS status = STATUS_GREEN; | |
| 30 | + STATUS_T status = STATUS_GREEN; | |
| 31 | ||
| 32 | crm_debug("Severity = %d, Disposition = %d", event->severity, event->disposition); | |
| 33 | ||
| 34 | @@ -91,7 +91,7 @@ | |
| 35 | struct sl_event *event = NULL; | |
| 36 | uint64_t event_id = 0; | |
| 37 | ||
| 38 | - crm_log_init_quiet("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv); | |
| 39 | + crm_log_init("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv, TRUE); | |
| 40 | crm_set_options(NULL, "event_id ", long_options, | |
| 41 | "Gets called upon events written to servicelog database"); | |
| 42 | ||
| 43 | @@ -153,7 +153,7 @@ | |
| 44 | } | |
| 45 | ||
| 46 | if (rc == 0) { | |
| 47 | - STATUS status = STATUS_GREEN; | |
| 48 | + STATUS_T status = STATUS_GREEN; | |
| 49 | const char *health_component = "#health-ipmi"; | |
| 50 | const char *health_status = NULL; | |
| 51 | ||
| 52 | @@ -167,9 +167,9 @@ | |
| 53 | if (health_status) { | |
| 54 | gboolean rc; | |
| 55 | ||
| 56 | - rc = attrd_update_no_mainloop(NULL, | |
| 57 | + rc = (attrd_update_delegate(NULL, | |
| 58 | 'v', | |
| 59 | - NULL, health_component, health_status, NULL, NULL, NULL); | |
| 60 | + NULL, health_component, health_status, NULL, NULL, NULL, NULL) > 0); | |
| 61 | ||
| 62 | crm_debug("attrd_update_no_mainloop ('%s', '%s') = %d", | |
| 63 | health_component, health_status, rc); | |
| 64 | --- pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c.orig 2013-07-26 02:02:31.000000000 +0200 | |
| 65 | +++ pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c 2013-09-07 22:09:35.002033998 +0200 | |
| 66 | @@ -565,7 +565,7 @@ | |
| 67 | ||
| 68 | crm_make_daemon("ipmiservicelogd", TRUE, "/var/run/ipmiservicelogd.pid0"); | |
| 69 | ||
| 70 | - crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv); | |
| 71 | + crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv, FALSE); | |
| 72 | ||
| 73 | #ifdef COMPLEX | |
| 74 | rv = ipmi_args_setup_con(args, os_hnd, NULL, &con); |