From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26925 invoked by alias); 20 Jun 2008 08:32:19 -0000 Received: (qmail 26889 invoked by uid 9702); 20 Jun 2008 08:32:17 -0000 Date: Fri, 20 Jun 2008 08:32:00 -0000 Message-ID: <20080620083217.26873.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.04-43-g5c5db57 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0d722b3eb28b383f489525d118da70cb0a87ec7a X-Git-Newrev: 5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00516.txt.bz2 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=5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c The branch, master has been updated via 5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c (commit) from 0d722b3eb28b383f489525d118da70cb0a87ec7a (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 5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c Author: Fabio M. Di Nitto Date: Fri Jun 20 10:31:55 2008 +0200 [QDISK] Fix build with new openais logsys Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: cman/qdisk/main.c | 4 ++-- cman/qdisk/mkqdisk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 47f0323..31e7819 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -53,7 +53,7 @@ void update_local_status(qd_ctx *ctx, node_info_t *ni, int max, int score, LOGSYS_DECLARE_SYSTEM (NULL, - LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_BUFFER_BEFORE_CONFIG, + LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_BUFFER_BEFORE_CONFIG, LOGDIR "/qdisk.log", SYSLOGFACILITY); @@ -1392,7 +1392,7 @@ main(int argc, char **argv) pid_t pid; quorum_header_t qh; - 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); + logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_FLUSH_AFTER_CONFIG); if (check_process_running(argv[0], &pid) && pid !=getpid()) { log_printf(LOG_INFO, "QDisk services already running\n"); diff --git a/cman/qdisk/mkqdisk.c b/cman/qdisk/mkqdisk.c index 5cfe5cb..c7a7ba6 100644 --- a/cman/qdisk/mkqdisk.c +++ b/cman/qdisk/mkqdisk.c @@ -12,7 +12,7 @@ #include #include -LOGSYS_DECLARE_SYSTEM (NULL, LOG_MODE_OUTPUT_STDERR | LOG_MODE_DISPLAY_DEBUG, NULL, SYSLOGFACILITY); +LOGSYS_DECLARE_SYSTEM (NULL, LOG_MODE_OUTPUT_STDERR, NULL, SYSLOGFACILITY); LOGSYS_DECLARE_SUBSYS ("QDISK", LOG_LEVEL_INFO); hooks/post-receive -- Cluster Project