Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Low: Bump some log messages to notice #205

Closed
wants to merge 1 commit into from
Closed

Low: Bump some log messages to notice #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions crmd/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
crm_info("%s is now %s", node->uname, node->state);
return;
case crm_status_nstate:
crm_info("%s is now %s (was %s)", node->uname, node->state, (const char *)data);
crm_notice("%s is now %s (was %s)", node->uname, node->state, (const char *)data);
if(safe_str_neq(data, node->state)) {
/* State did not change */
return;
Expand All @@ -138,7 +138,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d

/* crmd_proc_update(node, proc_flags); */
status = (node->processes & proc_flags) ? ONLINESTATUS : OFFLINESTATUS;
crm_info("Client %s/%s now has status [%s] (DC=%s)",
crm_notice("Client %s/%s now has status [%s] (DC=%s)",
node->uname, peer2text(proc_flags), status, AM_I_DC ? "true" : crm_str(fsa_our_dc));

if (((node->processes ^ old) & proc_flags) == 0) {
Expand Down
2 changes: 1 addition & 1 deletion crmd/lrm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,7 +1666,7 @@ do_lrm_rsc_op(lrmd_rsc_info_t * rsc, const char *operation, xmlNode * msg, xmlNo
}

/* now do the op */
crm_debug("Performing key=%s op=%s_%s_%d", transition, rsc->id, operation, op->interval);
crm_notice("Performing key=%s op=%s_%s_%d", transition, rsc->id, operation, op->interval);

if (fsa_state != S_NOT_DC && fsa_state != S_POLICY_ENGINE && fsa_state != S_TRANSITION_ENGINE) {
if (safe_str_neq(operation, "fail")
Expand Down
2 changes: 1 addition & 1 deletion crmd/messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ handle_shutdown_request(xmlNode * stored_msg)
host_from = fsa_our_uname;
}

crm_info("Creating shutdown request for %s (state=%s)", host_from, fsa_state2string(fsa_state));
crm_notice("Creating shutdown request for %s (state=%s)", host_from, fsa_state2string(fsa_state));
crm_log_xml_trace(stored_msg, "message");

now_s = crm_itoa(now);
Expand Down
2 changes: 1 addition & 1 deletion crmd/te_actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ te_rsc_command(crm_graph_t * graph, crm_action_t * action)
no_wait = TRUE;
}

crm_info("Initiating action %d: %s %s on %s%s%s",
crm_notice("Initiating action %d: %s %s on %s%s%s",
action->id, task, task_uuid, on_node,
is_local ? " (local)" : "", no_wait ? " - no waiting" : "");

Expand Down
2 changes: 1 addition & 1 deletion crmd/te_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
&diff_add_admin_epoch, &diff_add_epoch, &diff_add_updates,
&diff_del_admin_epoch, &diff_del_epoch, &diff_del_updates);
if (crm_str_eq(TYPE(reason), XML_CIB_TAG_NVPAIR, TRUE)) {
crm_info("%s:%d - Triggered transition abort (complete=%d, tag=%s, id=%s, name=%s, value=%s, magic=%s, cib=%d.%d.%d) : %s",
crm_notice("%s:%d - Triggered transition abort (complete=%d, tag=%s, id=%s, name=%s, value=%s, magic=%s, cib=%d.%d.%d) : %s",
fn, line, transition_graph->complete, TYPE(reason), ID(reason),
NAME(reason), VALUE(reason), magic ? magic : "NA", diff_add_admin_epoch,
diff_add_epoch, diff_add_updates, abort_text);
Expand Down
4 changes: 2 additions & 2 deletions crmd/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,10 +1051,10 @@ update_dc(xmlNode * msg)
/* do nothing */

} else if (fsa_our_dc != NULL) {
crm_info("Set DC to %s (%s)", crm_str(fsa_our_dc), crm_str(fsa_our_dc_version));
crm_notice("Set DC to %s (%s)", crm_str(fsa_our_dc), crm_str(fsa_our_dc_version));

} else if (last_dc != NULL) {
crm_debug("Unset DC. Was %s", crm_str(last_dc));
crm_notice("Unset DC. Was %s", crm_str(last_dc));
}

free(last_dc);
Expand Down
1 change: 1 addition & 0 deletions include/crm/pengine/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# define PE_INTERNAL__H
# include <crm/pengine/status.h>

# define pe_rsc_notice(rsc, fmt, args...) crm_log_tag(LOG_NOTICE, rsc ? rsc->id : "<NULL>", fmt, ##args)
# define pe_rsc_info(rsc, fmt, args...) crm_log_tag(LOG_INFO, rsc ? rsc->id : "<NULL>", fmt, ##args)
# define pe_rsc_debug(rsc, fmt, args...) crm_log_tag(LOG_DEBUG, rsc ? rsc->id : "<NULL>", fmt, ##args)
# define pe_rsc_trace(rsc, fmt, args...) crm_log_tag(LOG_TRACE, rsc ? rsc->id : "<NULL>", fmt, ##args)
Expand Down
2 changes: 1 addition & 1 deletion lib/pengine/unpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ determine_online_status(xmlNode * node_state, node_t * this_node, pe_working_set
pe_proc_warn("Node %s is unclean", this_node->details->uname);

} else if (this_node->details->online) {
crm_info("Node %s is %s", this_node->details->uname,
crm_notice("Node %s is %s", this_node->details->uname,
this_node->details->shutdown ? "shutting down" :
this_node->details->pending ? "pending" :
this_node->details->standby ? "standby" : "online");
Expand Down
4 changes: 2 additions & 2 deletions mcp/pacemaker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static void pcmk_child_exit(GPid pid, gint status, gpointer user_data)

} else if(WIFEXITED(status)) {
exitcode = WEXITSTATUS(status);
do_crm_log(exitcode == 0 ? LOG_INFO : LOG_ERR,
do_crm_log(exitcode == 0 ? LOG_NOTICE : LOG_ERR,
"Child process %s exited (pid=%d, rc=%d)", child->name, child->pid, exitcode);
}

Expand Down Expand Up @@ -267,7 +267,7 @@ start_child(pcmk_child_t * child)
/* parent */
g_child_watch_add(child->pid, pcmk_child_exit, child);

crm_info("Forked child %d for process %s%s", child->pid, child->name,
crm_notice("Forked child %d for process %s%s", child->pid, child->name,
use_valgrind ? " (valgrind enabled: " VALGRIND_BIN ")" : "");
update_node_processes(local_nodeid, NULL, get_process_list());
return TRUE;
Expand Down
4 changes: 2 additions & 2 deletions pengine/native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)

if (is_not_set(rsc->flags, pe_rsc_managed)
|| (current == NULL && next == NULL)) {
pe_rsc_info(rsc, "Leave %s\t(%s%s)",
pe_rsc_notice(rsc, "Leave %s\t(%s%s)",
rsc->id, role2text(rsc->role), is_not_set(rsc->flags,
pe_rsc_managed) ? " unmanaged" : "");
return;
Expand Down Expand Up @@ -1873,7 +1873,7 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)
log_change("Reload %s\t(%s %s)", rsc->id, role2text(rsc->role), next->details->uname);

} else if (start == NULL || is_set(start->flags, pe_action_optional)) {
pe_rsc_info(rsc, "Leave %s\t(%s %s)", rsc->id, role2text(rsc->role), next->details->uname);
pe_rsc_notice(rsc, "Leave %s\t(%s %s)", rsc->id, role2text(rsc->role), next->details->uname);

} else if (start && is_set(start->flags, pe_action_runnable) == FALSE) {
log_change("Stop %s\t(%s %s)", rsc->id, role2text(rsc->role), next->details->uname);
Expand Down