This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, master, updated. cluster-2.99.05-43-ga66be49
- From: fabbione at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 3 Jul 2008 04:11:31 -0000
- Subject: Cluster Project branch, master, updated. cluster-2.99.05-43-ga66be49
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a66be490568c86f1b4345407e20897d44a4f59c5
The branch, master has been updated
via a66be490568c86f1b4345407e20897d44a4f59c5 (commit)
from 2b9196e3fd4631ada6988ad2a084a9834e69674c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a66be490568c86f1b4345407e20897d44a4f59c5
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu Jul 3 06:11:01 2008 +0200
[BUILD] Allow users to configure default built-in syslog level
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
configure | 7 +++++++
make/defines.mk.input | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 2a497e3..4d936af 100755
--- a/configure
+++ b/configure
@@ -72,6 +72,7 @@ my %options = (
docdir => \$docdir,
logdir => \$logdir,
syslogfacility => \$syslogfacility,
+ sysloglevel => \$sysloglevel,
mibdir => \$mibdir,
snmpbin => \$snmpbin,
confdir => \$confdir,
@@ -153,6 +154,7 @@ my $err = &GetOptions (\%options,
'docdir=s',
'logdir=s',
'syslogfacility=s',
+ 'sysloglevel=s',
'mibdir=s',
'snmpbin=s',
'confdir=s',
@@ -198,6 +200,7 @@ if ($help || !$err) {
print "--docdir=\tthe base directory for misc cluster documentation files. (Default: {prefix}/share/doc/cluster)\n";
print "--logdir=\tthe base directory for cluster logging files. (Default: /var/log/cluster/)\n";
print "--syslogfacility=\tset the default syslog facility. (Default: LOG_LOCAL4)\n";
+ print "--sysloglevel=\tset the default syslog level. (Default: LOG_LEVEL_INFO)\n";
print "--mibdir=\tthe base directory for snmp mibs. (Default: {prefix}/share/snmp/mibs)\n";
print "--snmpbin=\tthe base directory for snmp binaries (Ex: /usr/bin/snmpwalk). (Default: {prefix}/bin)\n";
print "--confdir=\tthe cluster config directory. (Default: /etc/cluster)\n";
@@ -533,6 +536,9 @@ if (!$logdir) {
if (!$syslogfacility) {
$syslogfacility="LOG_LOCAL4";
}
+if (!$sysloglevel) {
+ $sysloglevel="LOG_LEVEL_INFO";
+}
if (!$mibdir) {
$mibdir="${prefix}/share/snmp/mibs";
}
@@ -692,6 +698,7 @@ while (<IFILE>) {
$_ =~ s/\@DOCDIR\@/$docdir/;
$_ =~ s/\@LOGDIR\@/$logdir/;
$_ =~ s/\@SYSLOGFACILITY\@/$syslogfacility/;
+ $_ =~ s/\@SYSLOGLEVEL\@/$sysloglevel/;
$_ =~ s/\@MIBDIR\@/$mibdir/;
$_ =~ s/\@SNMPBIN\@/$snmpbin/;
$_ =~ s/\@CONFDIR\@/$confdir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 7b49131..4cb348e 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -21,7 +21,7 @@ RANLIB = ranlib
CFLAGS += @CFLAGS@ -I@SRCDIR@/make
CFLAGS += -DDEFAULT_CONFIG_DIR=\"@CONFDIR@\" -DDEFAULT_CONFIG_FILE=\"@CONFFILE@\"
-CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@
+CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ -DSYSLOGLEVEL=@SYSLOGLEVEL@
LDFLAGS += @LDFLAGS@
SRCDIR = @SRCDIR@
hooks/post-receive
--
Cluster Project