diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-03-09 16:27:32 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-03-19 02:23:17 +0100 |
| commit | aa961e8807658812ec9be7221ef0f0536bd1d24d (patch) | |
| tree | c592609e59f06c41a68afdf98465d7027b27c5bf /ctdb/server/ctdbd.c | |
| parent | 3df36781019e6e1dae942f507fa374a9c57628c1 (diff) | |
| download | samba-aa961e8807658812ec9be7221ef0f0536bd1d24d.tar.gz | |
ctdb-tests: Drop ctdbd --event-script-dir option
Event scripts live in a standard place.
For testing, CTDB_BASE is modified.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index c2b16f41d33..6484b06ec28 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -46,7 +46,6 @@ static struct { const char *transport; const char *myaddress; const char *public_address_list; - const char *event_script_dir; const char *notification_script; const char *logging; const char *recovery_lock; @@ -70,7 +69,6 @@ static struct { .nlist = NULL, .public_address_list = NULL, .transport = "tcp", - .event_script_dir = NULL, .logging = "file:" LOGDIR "/log.ctdb", .db_dir = CTDB_VARDIR, .db_dir_persistent = CTDB_VARDIR "/persistent", @@ -125,7 +123,6 @@ int main(int argc, const char *argv[]) { "interactive", 'i', POPT_ARG_NONE, &interactive, 0, "don't fork", NULL }, { "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-dir", 0, POPT_ARG_STRING, &options.event_script_dir, 0, "event script directory", "dirname" }, { "logging", 0, POPT_ARG_STRING, &options.logging, 0, "logging method to be used", NULL }, { "nlist", 0, POPT_ARG_STRING, &options.nlist, 0, "node list file", "filename" }, { "notification-script", 0, POPT_ARG_STRING, &options.notification_script, 0, "notification script", "filename" }, @@ -316,15 +313,12 @@ int main(int argc, const char *argv[]) CTDB_NO_MEMORY(ctdb, ctdb->default_public_interface); } - if (options.event_script_dir != NULL) { - ctdb->event_script_dir = options.event_script_dir; - } else { - ctdb->event_script_dir = talloc_asprintf(ctdb, "%s/events.d", - getenv("CTDB_BASE")); - if (ctdb->event_script_dir == NULL) { - DEBUG(DEBUG_ERR,(__location__ " Out of memory\n")); - exit(1); - } + ctdb->event_script_dir = talloc_asprintf(ctdb, + "%s/events.d", + getenv("CTDB_BASE")); + if (ctdb->event_script_dir == NULL) { + DBG_ERR("Out of memory\n"); + exit(1); } if (options.notification_script != NULL) { |