public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.05-13-g3b32463 Date: Wed, 25 Jun 2008 05:01:00 -0000 [thread overview] Message-ID: <20080625050102.804.qmail@sourceware.org> (raw) 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=3b32463d209192a074ffdc9988c25b25136f3c91 The branch, master has been updated via 3b32463d209192a074ffdc9988c25b25136f3c91 (commit) via 4f823b80d31b23dacba7c6f510d1a843da37ac52 (commit) via 5f834f0a0a8e311fd7ec9766769c3200defd7963 (commit) via 5e21129f9c53eda20aa5c24d844800720bf70d48 (commit) from 95a5c6b13294742956b13070ebc4f4513278255f (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 3b32463d209192a074ffdc9988c25b25136f3c91 Author: Fabio M. Di Nitto <fdinitto@redhat.com> Date: Wed Jun 25 06:53:51 2008 +0200 [FENCE] fenced: update man page Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> commit 4f823b80d31b23dacba7c6f510d1a843da37ac52 Author: Fabio M. Di Nitto <fdinitto@redhat.com> Date: Wed Jun 25 06:44:49 2008 +0200 [CMAN] Remove unrequired includes Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> commit 5f834f0a0a8e311fd7ec9766769c3200defd7963 Author: Fabio M. Di Nitto <fdinitto@redhat.com> Date: Wed Jun 25 06:41:54 2008 +0200 [FENCE] fence_node: use logsys for logging to syslog Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> commit 5e21129f9c53eda20aa5c24d844800720bf70d48 Author: Fabio M. Di Nitto <fdinitto@redhat.com> Date: Wed Jun 25 06:34:08 2008 +0200 [CCS] Use common syslog facility Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> ----------------------------------------------------------------------- Summary of changes: ccs/ccsais/config.c | 2 +- cman/daemon/ais.c | 1 - cman/daemon/barrier.c | 1 - cman/daemon/daemon.c | 1 - cman/daemon/logging.c | 1 - fence/fence_node/Makefile | 3 ++- fence/fence_node/fence_node.c | 15 ++++++++++----- fence/man/fenced.8 | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ccs/ccsais/config.c b/ccs/ccsais/config.c index df3f66e..e5ec83a 100644 --- a/ccs/ccsais/config.c +++ b/ccs/ccsais/config.c @@ -186,7 +186,7 @@ static int ccs_readconfig(struct objdb_iface_ver0 *objdb, char **error_string) int ret; /* We need to set this up to internal defaults too early */ - openlog("openais", LOG_CONS|LOG_PID, LOG_LOCAL4); + openlog("openais", LOG_CONS|LOG_PID, SYSLOGFACILITY); /* Read low-level totem/aisexec etc config from CCS */ if ( !(ret = init_config(objdb, error_reason)) ) diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c index d4c637a..6c05397 100644 --- a/cman/daemon/ais.c +++ b/cman/daemon/ais.c @@ -7,7 +7,6 @@ #include <stdarg.h> #include <unistd.h> #include <string.h> -#include <syslog.h> #include <signal.h> #include <sys/socket.h> #include <sys/utsname.h> diff --git a/cman/daemon/barrier.c b/cman/daemon/barrier.c index 56eb791..3242e03 100644 --- a/cman/daemon/barrier.c +++ b/cman/daemon/barrier.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <fcntl.h> #include <unistd.h> -#include <syslog.h> #include <string.h> #include <sys/time.h> #include <unistd.h> diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c index 18c820d..3c18fc7 100644 --- a/cman/daemon/daemon.c +++ b/cman/daemon/daemon.c @@ -4,7 +4,6 @@ #include <stdio.h> #include <fcntl.h> #include <unistd.h> -#include <syslog.h> #include <string.h> #include <sys/time.h> #include <unistd.h> diff --git a/cman/daemon/logging.c b/cman/daemon/logging.c index 917e9b4..eb488d7 100644 --- a/cman/daemon/logging.c +++ b/cman/daemon/logging.c @@ -1,4 +1,3 @@ -#include <syslog.h> #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile index ee750db..e4cfec4 100644 --- a/fence/fence_node/Makefile +++ b/fence/fence_node/Makefile @@ -14,11 +14,12 @@ OBJS= fence_node.o CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -I${ccsincdir} -I${fenceincdir} +CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${openaisincdir} CFLAGS += -I$(S)/../libfenced CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence +LDFLAGS += -L${openaislibdir} -llogsys LDFLAGS += -L../libfenced -lfenced ${TARGET}: ${OBJS} diff --git a/fence/fence_node/fence_node.c b/fence/fence_node/fence_node.c index 9823650..0f6f42d 100644 --- a/fence/fence_node/fence_node.c +++ b/fence/fence_node/fence_node.c @@ -3,7 +3,7 @@ #include <unistd.h> #include <stdint.h> #include <string.h> -#include <syslog.h> +#include <openais/service/logsys.h> #include "libfence.h" #include "libfenced.h" @@ -22,6 +22,13 @@ while (0) static char *prog_name; +LOGSYS_DECLARE_SYSTEM (NULL, + LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED, + NULL, + SYSLOGFACILITY); + +LOGSYS_DECLARE_SUBSYS ("FENCE_NODE", LOG_LEVEL_INFO); + static void print_usage(void) { printf("Usage:\n"); @@ -85,15 +92,13 @@ int main(int argc, char *argv[]) if (!victim) die("no node name specified"); - openlog("fence_node", LOG_PID, LOG_USER); - error = fence_node(victim); if (error) { - syslog(LOG_ERR, "Fence of \"%s\" was unsuccessful\n", victim); + log_printf(LOG_ERR, "Fence of \"%s\" was unsuccessful\n", victim); exit(EXIT_FAILURE); } else { - syslog(LOG_NOTICE, "Fence of \"%s\" was successful\n", victim); + log_printf(LOG_NOTICE, "Fence of \"%s\" was successful\n", victim); /* Tell fenced what we've done so that it can avoid fencing this node again if the fence_node() rebooted it. */ diff --git a/fence/man/fenced.8 b/fence/man/fenced.8 index 78225db..8cdcf1a 100644 --- a/fence/man/fenced.8 +++ b/fence/man/fenced.8 @@ -49,7 +49,7 @@ until fencing succeeds. Other systems such as DLM and GFS will not begin their own recovery for a failed node until fenced has successfully completed fencing it. So, a delay or problem in fencing will result in other systems like DLM/GFS being blocked. Information about fencing -operations will appear in syslog. +operations will also appear in syslog. When a domain member fails, the actual fencing operation can be delayed by a configurable number of seconds (cluster.conf:post_fail_delay or -f). hooks/post-receive -- Cluster Project
reply other threads:[~2008-06-25 5:01 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080625050102.804.qmail@sourceware.org \ --to=fabbione@sourceware.org \ --cc=cluster-cvs@sources.redhat.com \ --cc=cluster-devel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).