Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 May 2006 02:22:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
remove the target_role when user wants the resource running automatically
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- mgmt_crm.c 11 May 2006 08:03:32 -0000 1.38
+++ mgmt_crm.c 11 May 2006 08:22:15 -0000 1.39
@@ -1298,6 +1298,16 @@
char prefix[MAX_STRLEN];
char suffix[MAX_STRLEN];
+ if (STRNCMP_CONST(argv[2],"default") == 0 ||
+ STRNCMP_CONST(argv[2],"Default") == 0) {
+ snprintf(buf, MAX_STRLEN,"%s_target_role", argv[1]);
+ rc = delete_object("resources", "nvpair", buf, &output);
+ if (rc < 0) {
+ return failed_msg(output, rc);
+ }
+ return cl_strdup(MSG_OK);
+ }
+
if(get_fix(argv[1], prefix, suffix) == -1) {
return cl_strdup(MSG_FAIL);
}
------------------------------
Message: 2
Date: Thu, 11 May 2006 02:38:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
improve some prompts
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- haclient.py.in 11 May 2006 07:02:49 -0000 1.34
+++ haclient.py.in 11 May 2006 08:38:46 -0000 1.35
@@ -948,7 +948,8 @@
glade.get_widget("addparam"),
glade.get_widget("delparam"),
_("Add Parameter"), fields)
-
param_list.insert({"id":uuid(),"name":"target_role","value":"stopped"})
+ param_list.insert({"id":uuid(),"name":"target_role",
+ "value":"stopped","shortdesc":"press \"Default\" or
\"Start\" button in toolbar/menu to start the resource"})
self.param_list = param_list
glade.get_widget("desc").set_text("")
if meta != None :
@@ -1462,7 +1463,7 @@
('delrsc', "ha-remove-resource", _('Delete'),
None,_('delete current item'), self.on_del_item),
('startrsc', "ha-start-resource", _('Start'),
None,_('start resource'), self.on_item_action),
('stoprsc', "ha-stop-resource", _('Stop'), None,_('stop
resource'), self.on_item_action),
- ('defaultrsc', "ha-default-resource", _('Default'),
None,_('start resource automatically'), self.on_item_action),
+ ('defaultrsc', "ha-default-resource", _('Default'),
None,_('work as default'), self.on_item_action),
('uprsc', "ha-up-resource", _('Move Up'), None,_('move
the resource up in the group'), self.on_item_move),
('downrsc', "ha-down-resource", _('Move Down'),
None,_('move the resource down in the group'), self.on_item_move),
('node', None, _('Nodes')),
------------------------------
Message: 3
Date: Thu, 11 May 2006 03:11:33 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
callbacks.c messages.c misc.c utils.c
Log Message:
Use the logging macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- callbacks.c 26 Apr 2006 13:33:24 -0000 1.122
+++ callbacks.c 11 May 2006 09:11:33 -0000 1.123
@@ -142,7 +142,7 @@
} else if(safe_str_eq(sys_from, CRM_SYSTEM_DC)) {
level = LOG_WARNING;
}
- do_crm_log(level, __FILE__, __FUNCTION__,
+ crm_log_maybe(level,
"Ignoring HA message (op=%s) from %s: not in our"
" membership list (size=%d)", op, from,
g_hash_table_size(fsa_membership_copy->members));
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- messages.c 8 May 2006 07:42:17 -0000 1.150
+++ messages.c 11 May 2006 09:11:33 -0000 1.151
@@ -252,7 +252,7 @@
}
slist_iter(
data, fsa_data_t, fsa_message_queue, lpc,
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"queue[%d(%d)]: input %s raised by %s()\t(cause=%s)",
lpc, data->id, fsa_input2string(data->fsa_input),
data->origin, fsa_cause2string(data->fsa_cause));
@@ -1124,7 +1124,7 @@
if(log_level == LOG_WARNING
|| (safe_str_neq(op, CRM_OP_HBEAT))) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Sending %sHA message (ref=%s) to [EMAIL PROTECTED]
%s.",
broadcast?"broadcast ":"directed ",
cl_get_string(msg, XML_ATTR_REFERENCE),
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/misc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- misc.c 18 May 2005 20:15:57 -0000 1.27
+++ misc.c 11 May 2006 09:11:33 -0000 1.28
@@ -46,7 +46,7 @@
log_type = LOG_ERR;
}
- do_crm_log(log_type, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_type,
"[[FSA]] Input %s from %s() received in state (%s)",
fsa_input2string(msg_data->fsa_input),
msg_data->origin,
@@ -67,7 +67,7 @@
} else if(msg_data->data_type == fsa_dt_lrm) {
lrm_op_t *input = fsa_typed_data(msg_data->data_type);
- do_crm_log(log_type, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_type,
"Resource %s: Call ID %d returned %d (%d)."
" New status if rc=0: %s",
input->rsc_id, input->call_id, input->rc,
@@ -77,7 +77,7 @@
struct crmd_ccm_data_s *input = fsa_typed_data(
msg_data->data_type);
int event = input->event;
- do_crm_log(log_type, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_type,
"Received \"%s\" event from the CCM.",
ccm_event_name(event));
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- utils.c 8 May 2006 07:42:18 -0000 1.92
+++ utils.c 11 May 2006 09:11:33 -0000 1.93
@@ -735,100 +735,100 @@
}
if(is_set(input_register, R_THE_DC)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"%s %.16llx (R_THE_DC)", text, R_THE_DC);
}
if(is_set(input_register, R_STARTING)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_STARTING)", text, R_STARTING);
+ crm_log_maybe(log_level, "%s %.16llx (R_STARTING)",
+ text, R_STARTING);
}
if(is_set(input_register, R_SHUTDOWN)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_SHUTDOWN)", text, R_SHUTDOWN);
+ crm_log_maybe(log_level, "%s %.16llx (R_SHUTDOWN)",
+ text, R_SHUTDOWN);
}
if(is_set(input_register, R_STAYDOWN)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_STAYDOWN)", text, R_STAYDOWN);
+ crm_log_maybe(log_level, "%s %.16llx (R_STAYDOWN)",
+ text, R_STAYDOWN);
}
if(is_set(input_register, R_JOIN_OK)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_JOIN_OK)", text, R_JOIN_OK);
+ crm_log_maybe(log_level, "%s %.16llx (R_JOIN_OK)",
+ text, R_JOIN_OK);
}
if(is_set(input_register, R_READ_CONFIG)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_READ_CONFIG)", text, R_READ_CONFIG);
+ crm_log_maybe(log_level, "%s %.16llx (R_READ_CONFIG)",
+ text, R_READ_CONFIG);
}
if(is_set(input_register, R_INVOKE_PE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_INVOKE_PE)", text, R_INVOKE_PE);
+ crm_log_maybe(log_level, "%s %.16llx (R_INVOKE_PE)",
+ text, R_INVOKE_PE);
}
if(is_set(input_register, R_CIB_CONNECTED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_CIB_CONNECTED)", text,
R_CIB_CONNECTED);
+ crm_log_maybe(log_level, "%s %.16llx (R_CIB_CONNECTED)",
+ text, R_CIB_CONNECTED);
}
if(is_set(input_register, R_PE_CONNECTED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_PE_CONNECTED)", text, R_PE_CONNECTED);
+ crm_log_maybe(log_level, "%s %.16llx (R_PE_CONNECTED)",
+ text, R_PE_CONNECTED);
}
if(is_set(input_register, R_TE_CONNECTED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_TE_CONNECTED)", text, R_TE_CONNECTED);
+ crm_log_maybe(log_level, "%s %.16llx (R_TE_CONNECTED)",
+ text, R_TE_CONNECTED);
}
if(is_set(input_register, R_LRM_CONNECTED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_LRM_CONNECTED)", text,
R_LRM_CONNECTED);
+ crm_log_maybe(log_level, "%s %.16llx (R_LRM_CONNECTED)",
+ text, R_LRM_CONNECTED);
}
if(is_set(input_register, R_CIB_REQUIRED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_CIB_REQUIRED)", text, R_CIB_REQUIRED);
+ crm_log_maybe(log_level, "%s %.16llx (R_CIB_REQUIRED)",
+ text, R_CIB_REQUIRED);
}
if(is_set(input_register, R_PE_REQUIRED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_PE_REQUIRED)", text, R_PE_REQUIRED);
+ crm_log_maybe(log_level, "%s %.16llx (R_PE_REQUIRED)",
+ text, R_PE_REQUIRED);
}
if(is_set(input_register, R_TE_REQUIRED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_TE_REQUIRED)", text, R_TE_REQUIRED);
+ crm_log_maybe(log_level, "%s %.16llx (R_TE_REQUIRED)",
+ text, R_TE_REQUIRED);
}
if(is_set(input_register, R_REQ_PEND)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_REQ_PEND)", text, R_REQ_PEND);
+ crm_log_maybe(log_level, "%s %.16llx (R_REQ_PEND)",
+ text, R_REQ_PEND);
}
if(is_set(input_register, R_PE_PEND)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_PE_PEND)", text, R_PE_PEND);
+ crm_log_maybe(log_level, "%s %.16llx (R_PE_PEND)",
+ text, R_PE_PEND);
}
if(is_set(input_register, R_TE_PEND)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_TE_PEND)", text, R_TE_PEND);
+ crm_log_maybe(log_level, "%s %.16llx (R_TE_PEND)",
+ text, R_TE_PEND);
}
if(is_set(input_register, R_RESP_PEND)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_RESP_PEND)", text, R_RESP_PEND);
+ crm_log_maybe(log_level, "%s %.16llx (R_RESP_PEND)",
+ text, R_RESP_PEND);
}
if(is_set(input_register, R_CIB_DONE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_CIB_DONE)", text, R_CIB_DONE);
+ crm_log_maybe(log_level, "%s %.16llx (R_CIB_DONE)",
+ text, R_CIB_DONE);
}
if(is_set(input_register, R_HAVE_CIB)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_HAVE_CIB)", text, R_HAVE_CIB);
+ crm_log_maybe(log_level, "%s %.16llx (R_HAVE_CIB)",
+ text, R_HAVE_CIB);
}
if(is_set(input_register, R_CIB_ASKED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_CIB_ASKED)", text, R_CIB_ASKED);
+ crm_log_maybe(log_level, "%s %.16llx (R_CIB_ASKED)",
+ text, R_CIB_ASKED);
}
if(is_set(input_register, R_CCM_DATA)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_CCM_DATA)", text, R_CCM_DATA);
+ crm_log_maybe(log_level, "%s %.16llx (R_CCM_DATA)",
+ text, R_CCM_DATA);
}
if(is_set(input_register, R_PEER_DATA)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_PEER_DATA)", text, R_PEER_DATA);
+ crm_log_maybe(log_level, "%s %.16llx (R_PEER_DATA)",
+ text, R_PEER_DATA);
}
if(is_set(input_register, R_IN_RECOVERY)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
- "%s %.16llx (R_IN_RECOVERY)", text, R_IN_RECOVERY);
+ crm_log_maybe(log_level, "%s %.16llx (R_IN_RECOVERY)",
+ text, R_IN_RECOVERY);
}
}
@@ -838,272 +838,272 @@
int log_level = LOG_DEBUG_3;
if(is_set(action, A_READCONFIG)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_READCONFIG) %s", A_READCONFIG,
text);
}
if(is_set(action, A_STARTUP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_STARTUP) %s", A_STARTUP, text);
}
if(is_set(action, A_STARTED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_STARTED) %s", A_STARTED, text);
}
if(is_set(action, A_HA_CONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CONNECT) %s", A_HA_CONNECT, text);
}
if(is_set(action, A_HA_DISCONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DISCONNECT) %s",
A_HA_DISCONNECT, text);
}
if(is_set(action, A_LRM_CONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_LRM_CONNECT) %s",
A_LRM_CONNECT, text);
}
if(is_set(action, A_LRM_EVENT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_LRM_EVENT) %s",
A_LRM_EVENT, text);
}
if(is_set(action, A_LRM_INVOKE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_LRM_INVOKE) %s",
A_LRM_INVOKE, text);
}
if(is_set(action, A_LRM_DISCONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_LRM_DISCONNECT) %s",
A_LRM_DISCONNECT, text);
}
if(is_set(action, A_DC_TIMER_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_TIMER_STOP) %s",
A_DC_TIMER_STOP, text);
}
if(is_set(action, A_DC_TIMER_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_TIMER_START) %s",
A_DC_TIMER_START, text);
}
if(is_set(action, A_INTEGRATE_TIMER_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_INTEGRATE_TIMER_START) %s",
A_INTEGRATE_TIMER_START, text);
}
if(is_set(action, A_INTEGRATE_TIMER_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_INTEGRATE_TIMER_STOP) %s",
A_INTEGRATE_TIMER_STOP, text);
}
if(is_set(action, A_FINALIZE_TIMER_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_FINALIZE_TIMER_START) %s",
A_FINALIZE_TIMER_START, text);
}
if(is_set(action, A_FINALIZE_TIMER_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_FINALIZE_TIMER_STOP) %s",
A_FINALIZE_TIMER_STOP, text);
}
if(is_set(action, A_ELECTION_COUNT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_ELECTION_COUNT) %s",
A_ELECTION_COUNT, text);
}
if(is_set(action, A_ELECTION_VOTE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_ELECTION_VOTE) %s",
A_ELECTION_VOTE, text);
}
if(is_set(action, A_ELECTION_CHECK)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_ELECTION_CHECK) %s",
A_ELECTION_CHECK, text);
}
if(is_set(action, A_CL_JOIN_ANNOUNCE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CL_JOIN_ANNOUNCE) %s",
A_CL_JOIN_ANNOUNCE, text);
}
if(is_set(action, A_CL_JOIN_REQUEST)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CL_JOIN_REQUEST) %s",
A_CL_JOIN_REQUEST, text);
}
if(is_set(action, A_CL_JOIN_RESULT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CL_JOIN_RESULT) %s",
A_CL_JOIN_RESULT, text);
}
if(is_set(action, A_DC_JOIN_OFFER_ALL)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_JOIN_OFFER_ALL) %s",
A_DC_JOIN_OFFER_ALL, text);
}
if(is_set(action, A_DC_JOIN_OFFER_ONE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_JOIN_OFFER_ONE) %s",
A_DC_JOIN_OFFER_ONE, text);
}
if(is_set(action, A_DC_JOIN_PROCESS_REQ)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_JOIN_PROCESS_REQ) %s",
A_DC_JOIN_PROCESS_REQ, text);
}
if(is_set(action, A_DC_JOIN_PROCESS_ACK)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_JOIN_PROCESS_ACK) %s",
A_DC_JOIN_PROCESS_ACK, text);
}
if(is_set(action, A_DC_JOIN_FINALIZE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_JOIN_FINALIZE) %s",
A_DC_JOIN_FINALIZE, text);
}
if(is_set(action, A_MSG_PROCESS)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_MSG_PROCESS) %s",
A_MSG_PROCESS, text);
}
if(is_set(action, A_MSG_ROUTE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_MSG_ROUTE) %s",
A_MSG_ROUTE, text);
}
if(is_set(action, A_RECOVER)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_RECOVER) %s",
A_RECOVER, text);
}
if(is_set(action, A_DC_RELEASE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_RELEASE) %s",
A_DC_RELEASE, text);
}
if(is_set(action, A_DC_RELEASED)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_RELEASED) %s",
A_DC_RELEASED, text);
}
if(is_set(action, A_DC_TAKEOVER)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_DC_TAKEOVER) %s",
A_DC_TAKEOVER, text);
}
if(is_set(action, A_SHUTDOWN)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_SHUTDOWN) %s", A_SHUTDOWN, text);
}
if(is_set(action, A_SHUTDOWN_REQ)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_SHUTDOWN_REQ) %s",
A_SHUTDOWN_REQ, text);
}
if(is_set(action, A_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_STOP ) %s", A_STOP , text);
}
if(is_set(action, A_EXIT_0)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_EXIT_0) %s", A_EXIT_0, text);
}
if(is_set(action, A_EXIT_1)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_EXIT_1) %s", A_EXIT_1, text);
}
if(is_set(action, A_CCM_CONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CCM_CONNECT) %s",
A_CCM_CONNECT, text);
}
if(is_set(action, A_CCM_DISCONNECT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CCM_DISCONNECT) %s",
A_CCM_DISCONNECT, text);
}
if(is_set(action, A_CCM_EVENT)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CCM_EVENT) %s",
A_CCM_EVENT, text);
}
if(is_set(action, A_CCM_UPDATE_CACHE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CCM_UPDATE_CACHE) %s",
A_CCM_UPDATE_CACHE, text);
}
if(is_set(action, A_CIB_BUMPGEN)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CIB_BUMPGEN) %s",
A_CIB_BUMPGEN, text);
}
if(is_set(action, A_CIB_INVOKE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CIB_INVOKE) %s",
A_CIB_INVOKE, text);
}
if(is_set(action, A_CIB_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CIB_START) %s",
A_CIB_START, text);
}
if(is_set(action, A_CIB_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_CIB_STOP) %s", A_CIB_STOP, text);
}
if(is_set(action, A_TE_INVOKE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_TE_INVOKE) %s", A_TE_INVOKE,
text);
}
if(is_set(action, A_TE_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_TE_START) %s",
A_TE_START, text);
}
if(is_set(action, A_TE_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_TE_STOP) %s", A_TE_STOP, text);
}
if(is_set(action, A_TE_CANCEL)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_TE_CANCEL) %s",
A_TE_CANCEL, text);
}
if(is_set(action, A_PE_INVOKE)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_PE_INVOKE) %s",
A_PE_INVOKE, text);
}
if(is_set(action, A_PE_START)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_PE_START) %s", A_PE_START, text);
}
if(is_set(action, A_PE_STOP)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_PE_STOP) %s", A_PE_STOP, text);
}
if(is_set(action, A_NODE_BLOCK)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_NODE_BLOCK) %s",
A_NODE_BLOCK, text);
}
if(is_set(action, A_UPDATE_NODESTATUS)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_UPDATE_NODESTATUS) %s",
A_UPDATE_NODESTATUS, text);
}
if(is_set(action, A_LOG)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_LOG ) %s", A_LOG, text);
}
if(is_set(action, A_ERROR)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_ERROR ) %s", A_ERROR, text);
}
if(is_set(action, A_WARN)) {
- do_crm_log(log_level, __FILE__, __FUNCTION__,
+ crm_log_maybe(log_level,
"Action %.16llx (A_WARN ) %s", A_WARN, text);
}
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 32
********************************************
