------------------------------------------------------------
revno: 382
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Tue 2007-05-29 15:26:38 +1000
message:
default log file to reasonable location
modified:
common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1
direct/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
packaging/RHEL/setup/ctdb.sysconfig
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
=== modified file 'common/cmdline.c'
--- a/common/cmdline.c 2007-05-29 05:20:41 +0000
+++ b/common/cmdline.c 2007-05-29 05:26:38 +0000
@@ -36,7 +36,6 @@
int self_connect;
const char *db_dir;
int torture;
- const char *logfile;
const char *events;
} ctdb_cmdline = {
.nlist = ETCDIR "/ctdb/nodes",
@@ -46,7 +45,6 @@
.self_connect = 0,
.db_dir = VARDIR "/ctdb",
.torture = 0,
- .logfile = NULL,
};
enum {OPT_EVENTSYSTEM=1};
@@ -74,7 +72,6 @@
{ "debug", 'd', POPT_ARG_INT, &LogLevel, 0, "debug level"},
{ "dbdir", 0, POPT_ARG_STRING, &ctdb_cmdline.db_dir, 0, "directory for
the tdb files", NULL },
{ "torture", 0, POPT_ARG_NONE, &ctdb_cmdline.torture, 0, "enable
nastiness in library", NULL },
- { "logfile", 0, POPT_ARG_STRING, &ctdb_cmdline.logfile, 0, "log file
location", "filename" },
{ "events", 0, POPT_ARG_STRING, NULL, OPT_EVENTSYSTEM, "event system",
NULL },
{ NULL }
};
@@ -100,12 +97,6 @@
exit(1);
}
- ret = ctdb_set_logfile(ctdb, ctdb_cmdline.logfile);
- if (ret == -1) {
- printf("ctdb_set_logfile failed - %s\n", ctdb_errstr(ctdb));
- exit(1);
- }
-
if (ctdb_cmdline.self_connect) {
ctdb_set_flags(ctdb, CTDB_FLAG_SELF_CONNECT);
}
=== modified file 'direct/ctdbd.c'
--- a/direct/ctdbd.c 2007-05-29 05:20:41 +0000
+++ b/direct/ctdbd.c 2007-05-29 05:26:38 +0000
@@ -42,11 +42,14 @@
const char *public_address_list;
const char *public_interface;
const char *event_script;
+ const char *logfile;
} options = {
- .event_script = ETCDIR "/ctdb/events"
+ .event_script = ETCDIR "/ctdb/events",
+ .logfile = VARDIR "/log/log.ctdb"
};
+
/*
main program
*/
@@ -62,6 +65,7 @@
{ "public-addresses", 0, POPT_ARG_STRING,
&options.public_address_list, 0, "public address list file", "filename" },
{ "public-interface", 0, POPT_ARG_STRING,
&options.public_interface, 0, "public interface", "interface"},
{ "event-script", 0, POPT_ARG_STRING, &options.event_script, 0,
"event script", "filename" },
+ { "logfile", 0, POPT_ARG_STRING, &options.logfile, 0, "log file
location", "filename" },
POPT_TABLEEND
};
int opt, ret;
@@ -94,6 +98,12 @@
ctdb = ctdb_cmdline_init(ev);
+ ret = ctdb_set_logfile(ctdb, options.logfile);
+ if (ret == -1) {
+ printf("ctdb_set_logfile to %s failed - %s\n", options.logfile,
ctdb_errstr(ctdb));
+ exit(1);
+ }
+
if (options.public_interface) {
ctdb->takeover.interface = talloc_strdup(ctdb,
options.public_interface);
CTDB_NO_MEMORY(ctdb, ctdb->takeover.interface);
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig 2007-05-28 15:38:04 +0000
+++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-05-29 05:26:38 +0000
@@ -1,8 +1,7 @@
# Options to ctdbd
-CLUSTER_NODES=/etc/samba/cluster_nodes.txt
-PUBLIC_ADDRESSES=/etc/samba/public_addresses.txt
+CLUSTER_NODES=/etc/ctdb/nodes
+PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
PUBLIC_INTERFACE=eth0
-#CTDB_PORT=9001
#LOGFILE=/var/log/samba/log.ctdb
#DEBUGLEVEL=0
