[SCM] CTDB repository - branch master updated - ctdb-1.0.59-5-gd13da2e

[Ronnie Sahlberg]

The branch, master has been updated
       via  d13da2e8fe2fab619540525d98a5502a23ab7d20 (commit)
      from  8e912abc2c68f5fe7b06c600ba6fec1a6900127c (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d13da2e8fe2fab619540525d98a5502a23ab7d20
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Oct 15 01:08:29 2008 +1100

    Revert "from Mathieu Parent <math.parent at gmail.com>"
    
    This reverts commit dc9cd4779db4a89697731e4cf415be51067a07c1.
    
    Conflicts:

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

Summary of changes:
 Makefile.in    |    5 ++---
 server/ctdbd.c |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index e51fec9..cf1240b 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,6 @@ bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
 localstatedir = @localstatedir@
-logdir = @logdir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
 etcdir = @sysconfdir@
@@ -30,8 +29,8 @@ IPQ_LIBS = @IPQ_LIBS@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
-	-DVARDIR=\"$(localstatedir)\" -DLOGDIR=\"$(logdir)\" \
-	-DETCDIR=\"$(etcdir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
+	-DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
 
diff --git a/server/ctdbd.c b/server/ctdbd.c
index 48e361f..4dc0f74 100644
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -50,7 +50,7 @@ static struct {
 	.nlist = ETCDIR "/ctdb/nodes",
 	.transport = "tcp",
 	.event_script_dir = ETCDIR "/ctdb/events.d",
-	.logfile = LOGDIR "/log.ctdb",
+	.logfile = VARDIR "/log/log.ctdb",
 	.db_dir = VARDIR "/ctdb",
 	.db_dir_persistent = VARDIR "/ctdb/persistent",
 };


-- 
CTDB repository