Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: lrm by zhenh from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: cts by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 00:56:02 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
use zero as unset tag of gloop instead of -1. avoid beam complain
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -3 -r1.237 -r1.238
--- lrmd.c 15 Aug 2006 01:48:55 -0000 1.237
+++ lrmd.c 15 Aug 2006 06:56:02 -0000 1.238
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.237 2006/08/15 01:48:55 zhenh Exp $ */
+/* $Id: lrmd.c,v 1.238 2006/08/15 06:56:02 zhenh Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -547,14 +547,14 @@
return;
}
- if ((int)op->repeat_timeout_tag > 0) {
+ if (op->repeat_timeout_tag > 0) {
Gmain_timeout_remove(op->repeat_timeout_tag);
- op->repeat_timeout_tag =(guint)-1;
+ op->repeat_timeout_tag =(guint)0;
}
- if ((int)op->timeout_tag > 0) {
+ if (op->timeout_tag > 0) {
Gmain_timeout_remove(op->timeout_tag);
- op->timeout_tag = (guint)-1;
+ op->timeout_tag = (guint)0;
}
ha_msg_del(op->msg);
@@ -587,8 +587,8 @@
op->rsc_id = NULL;
op->msg = NULL;
op->exec_pid = -1;
- op->timeout_tag = -1;
- op->repeat_timeout_tag = -1;
+ op->timeout_tag = 0;
+ op->repeat_timeout_tag = 0;
op->rapop = NULL;
op->first_line_ra_stdout[0] = EOS;
op->t_recv = time_longclock();
@@ -618,10 +618,10 @@
ret->rapop = NULL;
ret->msg = ha_msg_copy(op->msg);
ret->rsc_id = cl_strdup(op->rsc_id);
- ret->timeout_tag = -1;
+ ret->timeout_tag = 0;
ret->rapop = NULL;
ret->first_line_ra_stdout[0] = EOS;
- ret->repeat_timeout_tag = -1;
+ ret->repeat_timeout_tag = 0;
ret->exec_pid = -1;
ret->is_copy = TRUE;
return ret;
@@ -870,9 +870,9 @@
rsc->last_op_done = NULL;
}
- if ((int)rsc->delay_timeout > 0) {
+ if (rsc->delay_timeout > 0) {
Gmain_timeout_remove(rsc->delay_timeout);
- rsc->delay_timeout = (guint)-1;
+ rsc->delay_timeout = (guint)0;
}
cl_free(rsc);
@@ -889,7 +889,7 @@
dump_mem_stats();
return NULL;
}
- rsc->delay_timeout = (guint)-1;
+ rsc->delay_timeout = (guint)0;
if (id) {
rsc->id = cl_strdup(id);
}
@@ -1322,7 +1322,6 @@
int
init_start ()
{
- long pid;
DIR* dir = NULL;
PILPluginUniv * PluginLoadingSystem = NULL;
struct dirent* subdir;
@@ -1347,7 +1346,7 @@
{"RAExec", &RAExecFuncs, NULL, NULL, NULL},
{ NULL, NULL, NULL, NULL, NULL} };
- if ((pid = cl_lock_pidfile(PID_FILE)) < 0) {
+ if (cl_lock_pidfile(PID_FILE) < 0) {
lrmd_log(LOG_ERR, "already running: [pid %d].",
cl_read_pidfile(PID_FILE));
lrmd_log(LOG_ERR, "Startup aborted (already running). Shutting
down.");
exit(100);
@@ -1839,18 +1838,18 @@
return FALSE;
}
rsc->repeat_op_list = g_list_remove(rsc->repeat_op_list, op);
- if ((int)op->repeat_timeout_tag > 0) {
+ if (op->repeat_timeout_tag > 0) {
Gmain_timeout_remove(op->repeat_timeout_tag);
- op->repeat_timeout_tag = (guint)-1;
+ op->repeat_timeout_tag = (guint)0;
}
/* FIXME: Is there a special reason for setting
* op->repeat_timeout_tag twice, and if so, why does the cast to
* (guint) matter once but not twice? */
- op->repeat_timeout_tag = -1;
+ op->repeat_timeout_tag = 0;
op->exec_pid = -1;
- op->timeout_tag = -1;
+ op->timeout_tag = 0;
if (!shutdown_in_progress) {
op->t_addtolist = time_longclock();
@@ -2504,7 +2503,7 @@
op->call_id = call_id;
op->exec_pid = -1;
op->client_id = client->pid;
- op->timeout_tag = -1;
+ op->timeout_tag = 0;
op->rsc_id = cl_strdup(rsc->id);
op->msg = ha_msg_copy(msg);
op->t_recv = time_longclock();
@@ -2793,8 +2792,8 @@
/* Don't let the timers go away */
lrmd_op_destroy(old_op);
}else{
- new_op->timeout_tag = (guint)-1;
- new_op->repeat_timeout_tag = (guint)-1;
+ new_op->timeout_tag = (guint)0;
+ new_op->repeat_timeout_tag = (guint)0;
new_op->exec_pid = -1;
g_hash_table_insert(client_last_op
, op_hash_key
@@ -2837,9 +2836,9 @@
/* we should check if the resource exists. */
rsc = lookup_rsc(op->rsc_id);
if (rsc == NULL) {
- if((int)op->timeout_tag > 0 ) {
+ if(op->timeout_tag > 0 ) {
Gmain_timeout_remove(op->timeout_tag);
- op->timeout_tag = (guint)-1;
+ op->timeout_tag = (guint)0;
}
lrmd_log(LOG_ERR
, "%s: the resource for the operation %s does not exist."
@@ -2986,9 +2985,9 @@
, "on_op_done:%s is removed from op list"
, op_info(op));
- if( (int)op->timeout_tag > 0 ) {
+ if( op->timeout_tag > 0 ) {
Gmain_timeout_remove(op->timeout_tag);
- op->timeout_tag = (guint)-1;
+ op->timeout_tag = (guint)0;
}
@@ -3003,15 +3002,15 @@
lrmd_op_destroy(rsc->last_op_done);
}
rsc->last_op_done = lrmd_op_copy(op);
- rsc->last_op_done->timeout_tag = (guint)-1;
- rsc->last_op_done->repeat_timeout_tag = (guint)-1;
+ rsc->last_op_done->timeout_tag = (guint)0;
+ rsc->last_op_done->repeat_timeout_tag = (guint)0;
/*copy the repeat op to repeat list to wait next perform */
if ( 0 != op->interval && NULL != lookup_client(op->client_id)
&& LRM_OP_CANCELLED != op_status) {
lrmd_op_t* repeat_op = lrmd_op_copy(op);
repeat_op->exec_pid = -1;
- repeat_op->timeout_tag = -1;
+ repeat_op->timeout_tag = 0;
repeat_op->is_copy = FALSE;
repeat_op->repeat_timeout_tag =
Gmain_timeout_add(op->interval,
@@ -3063,9 +3062,9 @@
return FALSE;
}
- if ((int)rsc->delay_timeout > 0) {
+ if (rsc->delay_timeout > 0) {
Gmain_timeout_remove(rsc->delay_timeout);
- rsc->delay_timeout = (guint)-1;
+ rsc->delay_timeout = (guint)0;
}
perform_op(rsc);
@@ -3896,6 +3895,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.238 2006/08/15 06:56:02 zhenh
+ * use zero as unset tag of gloop instead of -1. avoid beam complain
+ *
* Revision 1.237 2006/08/15 01:48:55 zhenh
* remove the more comma
*
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 00:57:37 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
Makefile.am
Log Message:
Remove reference to dead file
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 3 Aug 2006 11:43:11 -0000 1.16
+++ Makefile.am 15 Aug 2006 06:57:37 -0000 1.17
@@ -37,7 +37,6 @@
cts_SCRIPTS = \
CTSproxy.py \
- OCFMSDummy \
LSBDummy
all-local: $(cts_PYTHON)
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 01:03:58 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
ldirectord.in
Log Message:
Add body to emailalert
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ldirectord.in 15 Aug 2006 04:02:41 -0000 1.17
+++ ldirectord.in 15 Aug 2006 07:03:58 -0000 1.18
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.17 2006/08/15 04:02:41 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.18 2006/08/15 07:03:58 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3199,7 +3199,7 @@
unless ($emailmsg = new Mail::Send Subject=>$emailsubject, To=>$emailto
and $emailfh = $emailmsg->open
- and print $emailfh ""
+ and print $emailfh $emailsubject
and $emailfh->close) {
&ld_log("failed to send email message\n");
$status = 1;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 37
********************************************
