FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 04-23-2008, 08:16 AM
 
Default Cluster Project branch, master, updated. gfs-kernel_0_1_22-200-g74315c4

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=74315c485a 9c134caa9d4a2cb77715c32c7493c5

The branch, master has been updated
via 74315c485a9c134caa9d4a2cb77715c32c7493c5 (commit)
via 6a14c16074c814f7af7dab77243ad7aa9e4aa85d (commit)
from 534ec407728c029de197b12203ea2be4c25e10a7 (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 74315c485a9c134caa9d4a2cb77715c32c7493c5
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Wed Apr 23 10:12:51 2008 +0200

[CCS] Switch to use user selected logdir and syslogfacility

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit 6a14c16074c814f7af7dab77243ad7aa9e4aa85d
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Wed Apr 23 10:12:18 2008 +0200

[BUILD] Allow users to set default log dir and syslog facility

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
ccs/daemon/ccsd.c | 8 ++++----
configure | 14 ++++++++++++++
make/defines.mk.input | 2 ++
3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ccs/daemon/ccsd.c b/ccs/daemon/ccsd.c
index c3ba84f..55be7f1 100644
--- a/ccs/daemon/ccsd.c
+++ b/ccs/daemon/ccsd.c
@@ -52,9 +52,9 @@ static int setup_local_socket(int backlog);
static inline void process_signals(void);

LOGSYS_DECLARE_SYSTEM (NULL,
- LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_BUFFER_BEFORE_CONFIG,
- NULL,
- LOG_LOCAL4);
+ LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_BUFFER_BEFORE_CONFIG,
+ LOGDIR "/ccs.log",
+ SYSLOGFACILITY);

LOGSYS_DECLARE_SUBSYS ("CCS", LOG_LEVEL_INFO);

@@ -71,7 +71,7 @@ int main(int argc, char *argv[]){

msg = parse_cli_args(argc, argv);

- logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_FLUSH_AFTER_CONFIG);
+ logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_FLUSH_AFTER_CONFIG);

if(debug || getenv("CCS_DEBUGLOG"))
logsys_config_priority_set (LOG_LEVEL_DEBUG);
diff --git a/configure b/configure
index e993d36..27777fe 100755
--- a/configure
+++ b/configure
@@ -78,6 +78,8 @@ my %options = (
prefix => $prefix,
sbindir => $sbindir,
sharedir => $sharedir,
+ logdir => $logdir,
+ syslogfacility => $syslogfacility,
mibdir => $mibdir,
snmpbin => $snmpbin,
confdir => $confdir,
@@ -150,6 +152,8 @@ my $err = &GetOptions (\%options,
'prefix=s',
'sbindir=s',
'sharedir=s',
+ 'logdir=s',
+ 'syslogfacility=s',
'mibdir=s',
'snmpbin=s',
'confdir=s',
@@ -190,6 +194,8 @@ if ($help || !$err) {
print "--libdir= the base directory for libraries. (Default: {prefix}/lib)
";
print "--libexecdir= the base directory for executable components. (Default: {prefix}/libexec)
";
print "--sharedir= the base directory for misc cluster files. (Default: {prefix}/share/cluster)
";
+ print "--logdir= the base directory for cluster logging files. (Default: /var/log/cluster/)
";
+ print "--syslogfacility= set the default syslog facility. (Default: LOG_LOCAL4)
";
print "--mibdir= the base directory for snmp mibs. (Default: {prefix}/share/snmp/mibs)
";
print "--snmpbin= the base directory for snmp binaries (Ex: /usr/bin/snmpwalk). (Default: {prefix}/bin)
";
print "--confdir= the cluster config directory. (Default: /etc/cluster)
";
@@ -517,6 +523,12 @@ if (!$sbindir) {
if (!$sharedir) {
$sharedir="${prefix}/share/cluster";
}
+if (!$logdir) {
+ $logdir="/var/log/cluster";
+}
+if (!$syslogfacility) {
+ $syslogfacility="LOG_LOCAL4";
+}
if (!$mibdir) {
$mibdir="${prefix}/share/snmp/mibs";
}
@@ -662,6 +674,8 @@ while (<IFILE>) {
$_ =~ s/@MANDIR@/$mandir/;
$_ =~ s/@SBINDIR@/$sbindir/;
$_ =~ s/@SHAREDIR@/$sharedir/;
+ $_ =~ s/@LOGDIR@/$logdir/;
+ $_ =~ s/@SYSLOGFACILITY@/$syslogfacility/;
$_ =~ s/@MIBDIR@/$mibdir/;
$_ =~ s/@SNMPBIN@/$snmpbin/;
$_ =~ s/@CONFDIR@/$confdir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 63d639e..6482cbe 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -16,6 +16,7 @@ sbindir ?= ${DESTDIR}@SBINDIR@
libdir ?= ${DESTDIR}@LIBDIR@
libexecdir ?= ${DESTDIR}@LIBEXECDIR@
sharedir ?= ${DESTDIR}@SHAREDIR@
+logdir ?= ${DESTDIR}@LOGDIR@
mandir ?= ${DESTDIR}@MANDIR@
module_dir ?= @MODULE_DIR@
incdir ?= ${DESTDIR}@INCDIR@
@@ -31,6 +32,7 @@ RANLIB = ranlib

CFLAGS += @CFLAGS@ -I@SRCDIR@/config
CFLAGS += -DDEFAULT_CONFIG_DIR="@CONFDIR@" -DDEFAULT_CONFIG_FILE="@CONFFILE@"
+CFLAGS += -DLOGDIR="@LOGDIR@" -DSYSLOGFACILITY=@SYSLOGFACILITY@
LDFLAGS += @LDFLAGS@

SRCDIR = @SRCDIR@


hooks/post-receive
--
Cluster Project
 

Thread Tools




All times are GMT. The time now is 09:36 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org