From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 775 invoked by alias); 5 Mar 2009 17:29:45 -0000 Received: (qmail 769 invoked by alias); 5 Mar 2009 17:29:45 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: fence: master - fenced: don't exit from query thread To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e5898a3d38f9814fa1a550e3b4122dca524641a9 X-Git-Newrev: 445cf14ca007c11c16426678d5ad67802ed716af From: David Teigland Message-Id: <20090305172919.36B551201F1@lists.fedorahosted.org> Date: Thu, 05 Mar 2009 17:29:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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: 2009-q1/txt/msg00694.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=445cf14ca007c11c16426678d5ad67802ed716af Commit: 445cf14ca007c11c16426678d5ad67802ed716af Parent: e5898a3d38f9814fa1a550e3b4122dca524641a9 Author: David Teigland AuthorDate: Thu Mar 5 11:25:54 2009 -0600 Committer: David Teigland CommitterDate: Thu Mar 5 11:26:31 2009 -0600 fenced: don't exit from query thread If the query thread gets an error it should just return instead of calling exit() and terminating the daemon uncleanly. Signed-off-by: David Teigland --- fence/fenced/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 451db6c..ddba022 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -534,14 +534,14 @@ static void *process_queries(void *arg) rv = setup_listener(FENCED_QUERY_SOCK_PATH); if (rv < 0) - exit (-1); + return NULL; s = rv; for (;;) { f = accept(s, NULL, NULL); if (f < 0) - exit (-1); + return NULL; rv = do_read(f, &h, sizeof(h)); if (rv < 0) {