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: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: resources by alan from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 May 2006 06:13:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Revert change with unintended sorting consequences
- resulted in parameters being sorted differently and therefore resources
were unneccessarily restarted
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- xml.c 11 May 2006 09:36:17 -0000 1.81
+++ xml.c 11 May 2006 12:13:06 -0000 1.82
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.81 2006/05/11 09:36:17 andrew Exp $ */
+/* $Id: xml.c,v 1.82 2006/05/11 12:13:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2368,7 +2368,7 @@
} else if(pair_b->name == NULL) {
return -1;
}
- return strcasecmp(pair_a->name, pair_b->name);
+ return strcmp(pair_a->name, pair_b->name);
}
static void
@@ -2444,7 +2444,7 @@
for(i = 0; i < digest_len; i++) {
sprintf(digest+(2*i), "%02x", raw_digest[i]);
}
- crm_debug_2("Digest is: %s\n", digest);
+ crm_debug_2("Digest %s: %s\n", digest, buffer);
crm_log_xml(LOG_DEBUG_3, "digest:source", sorted);
crm_free(buffer);
crm_free(raw_digest);
------------------------------
Message: 2
Date: Thu, 11 May 2006 06:13:07 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
incarnation.c rules.c
Log Message:
Revert change with unintended sorting consequences
- resulted in parameters being sorted differently and therefore resources
were unneccessarily restarted
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- incarnation.c 8 May 2006 07:42:18 -0000 1.82
+++ incarnation.c 11 May 2006 12:13:06 -0000 1.83
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.82 2006/05/08 07:42:18 andrew Exp $ */
+/* $Id: incarnation.c,v 1.83 2006/05/11 12:13:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -986,7 +986,7 @@
if(entry_a->rsc == NULL) { return 1; }
if(entry_b->rsc == NULL) { return -1; }
- tmp = strcasecmp(entry_a->rsc->id, entry_b->rsc->id);
+ tmp = strcmp(entry_a->rsc->id, entry_b->rsc->id);
if(tmp != 0) {
return tmp;
}
@@ -995,7 +995,7 @@
if(entry_a->node == NULL) { return 1; }
if(entry_b->node == NULL) { return -1; }
- return strcasecmp(entry_a->node->details->id,
entry_b->node->details->id);
+ return strcmp(entry_a->node->details->id, entry_b->node->details->id);
}
static void
@@ -1385,7 +1385,7 @@
CRM_ASSERT(resource1 != NULL);
CRM_ASSERT(resource2 != NULL);
- return strcasecmp(resource1->id, resource2->id);
+ return strcmp(resource1->id, resource2->id);
}
gboolean
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/rules.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- rules.c 8 May 2006 07:42:18 -0000 1.23
+++ rules.c 11 May 2006 12:13:06 -0000 1.24
@@ -1,4 +1,4 @@
-/* $Id: rules.c,v 1.23 2006/05/08 07:42:18 andrew Exp $ */
+/* $Id: rules.c,v 1.24 2006/05/11 12:13:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -231,7 +231,7 @@
if(value != NULL && h_val != NULL) {
if(type == NULL || (safe_str_eq(type, "string"))) {
- cmp = strcasecmp(h_val, value);
+ cmp = strcmp(h_val, value);
} else if(safe_str_eq(type, "number")) {
int h_val_f = crm_parse_int(h_val, NULL);
------------------------------
Message: 3
Date: Thu, 11 May 2006 08:56:43 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
apache.in
Log Message:
Updates and a bug fix for the apache resource agent.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- apache.in 18 Apr 2006 20:24:01 -0000 1.18
+++ apache.in 11 May 2006 14:56:42 -0000 1.19
@@ -31,6 +31,7 @@
# OCF_RESKEY_httpd
# OCF_RESKEY_port
# OCF_RESKEY_statusurl
+# OCF_RESKEY_options
[EMAIL PROTECTED]@/run
@@ -268,7 +269,17 @@
if
[ "X$STATUSURL" = "X" ]
then
- STATUSURL="${LOCALHOST}:${PORT}$StatusURL"
+ DoIHaveIP=`apache_param "$ConfigFile" Listen|head -1`
+ if
+ [ "x$DoIHaveIP" != "x" ]
+ then
+ STATUSURL="http://${DoIHaveIP}$StatusURL";
+ case $WGET in
+ *wget*) WGETOPTS="$WGETOPTS --bind-address=127.0.0.1";;
+ esac
+ else
+ STATUSURL="${LOCALHOST}:${PORT}$StatusURL"
+ fi
fi
fi
if
@@ -316,7 +327,7 @@
ocf_log info "$CMD already running (pid $ApachePID)"
return $OCF_SUCCESS
fi
- ocf_run $HTTPD $HTTPDOPTS -f $CONFIGFILE
+ ocf_run $HTTPD $HTTPDOPTS $OPTIONS -f $CONFIGFILE
}
stop_apache() {
@@ -390,48 +401,62 @@
<version>1.0</version>
<longdesc lang="en">
-starts/stops apache web servers.
+This is the resource agent for the
+Apache web server.
+Thie resource agent operates both version 1.x and version 2.x Apache
+servers.
+See also http://httpd.apache.org/
</longdesc>
-<shortdesc lang="en">starts/stops apache web servers.</shortdesc>
+<shortdesc lang="en">Apache web server</shortdesc>
<parameters>
-<parameter name="configfile" required="1">
+<parameter name="configfile" required="1" unique="1">
<longdesc lang="en">
-The fullpath name of configure file.It's a string of path
-name. Other parameters can contain in this file.
+The full pathname of the Apache configuration file.
+This file is parsed to provide defaults for various other
+resource agent parameters.
</longdesc>
-<shortdesc lang="en">configure file path</shortdesc>
+<shortdesc lang="en">configuration file path</shortdesc>
<content type="string" default="/etc/httpd/httpd.conf" />
</parameter>
<parameter name="httpd">
<longdesc lang="en">
-The fullpath name of the executable binary httpd.It's a string of path
-name. It's optional.
+The full pathname of the httpd binary (optional).
</longdesc>
-<shortdesc lang="en">httpd executable binary path</shortdesc>
+<shortdesc lang="en">httpd binary path</shortdesc>
<content type="string" default="/usr/sbin/httpd" />
</parameter>
-<parameter name="port" unique="1">
+<parameter name="port" >
<longdesc lang="en">
-The number of port, on that port apache instance provide service.
-It's a string of number. Also can get from file.
-the "main" web server at $PORT will also support it if we can find it
-somewhere in the file.
-it will be supported at the same URL as the one we find in the file
+A port number that we can probe for status information
+using the statusurl.
+This will default to the port number found in the
+configuration file, or 80, if none can be found
+in the configuration file.
+
</longdesc>
-<shortdesc lang="en">apache port number</shortdesc>
-<content type="string" default="80"/>
+<shortdesc lang="en">httpd port</shortdesc>
+<content type="integer" />
</parameter>
-<parameter name="statusurl" unique="2">
+<parameter name="statusurl">
<longdesc lang="en">
-The url of the apache instance. It's a string.
-Also can get from file.
+The URL of the apache status module.
+If left unspecified, it will be inferred
+from the apache configuration file.
</longdesc>
<shortdesc lang="en">url name</shortdesc>
-<content type="integer" default=""/>
+<content type="string" />
+</parameter>
+
+<parameter name="options">
+<longdesc lang="en">
+Extra options to apply when starting apache. See man httpd(8).
+</longdesc>
+<shortdesc lang="en">command line options</shortdesc>
+<content type="string" ""/>
</parameter>
</parameters>
@@ -464,7 +489,7 @@
: OK to be empty
else
case $STATUSURL in
- http://*/*.*) ;;
+ http://*/*) ;;
*)
ocf_log err "Invalid STATUSURL $STATUSURL"
exit $OCF_ERR_ARGS ;;
@@ -492,6 +517,7 @@
PORT="$OCF_RESKEY_port"
STATUSURL="$OCF_RESKEY_statusurl"
CONFIGFILE="$OCF_RESKEY_configfile"
+ OPTIONS="$OCF_RESKEY_options"
else
usage
fi
------------------------------
_______________________________________________
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 30, Issue 35
********************************************
