diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-16 14:23:00 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-05-17 04:04:31 +0200 |
| commit | 78fbbfa4d3892d66c4dc2f02bb2b3200cfcd5159 (patch) | |
| tree | 7a2ece2ec3da3dc82e3ed5bc43110785d3da53be /ctdb/server | |
| parent | 4e06610f8c9d8036492028ee0dc74cd8bef0d9e5 (diff) | |
| download | samba-78fbbfa4d3892d66c4dc2f02bb2b3200cfcd5159.tar.gz | |
ctdb-daemon: Drop most ctdbd command-line options
All except -i/--interactive. This remaining popt option is now neatly
wrapped to fit in 80 columns.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdbd.c | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index e242a3e224e..252309cceab 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -43,31 +43,6 @@ #include "ctdb_config.h" -static struct { - const char *debuglevel; - const char *transport; - const char *myaddress; - const char *logging; - const char *recovery_lock; - const char *db_dir; - const char *db_dir_persistent; - const char *db_dir_state; - int nosetsched; - int start_as_disabled; - int start_as_stopped; - int no_lmaster; - int no_recmaster; - int script_log_level; -} options = { - .debuglevel = "NOTICE", - .transport = "tcp", - .logging = "file:" LOGDIR "/log.ctdb", - .db_dir = CTDB_VARDIR "/volatile", - .db_dir_persistent = CTDB_VARDIR "/persistent", - .db_dir_state = CTDB_VARDIR "/state", - .script_log_level = DEBUG_ERR, -}; - int script_log_level; bool fast_start; @@ -174,21 +149,8 @@ int main(int argc, const char *argv[]) struct poptOption popt_options[] = { POPT_AUTOHELP - { "debug", 'd', POPT_ARG_STRING, &options.debuglevel, 0, "debug level", NULL }, - { "interactive", 'i', POPT_ARG_NONE, &interactive, 0, "don't fork", NULL }, - { "logging", 0, POPT_ARG_STRING, &options.logging, 0, "logging method to be used", NULL }, - { "listen", 0, POPT_ARG_STRING, &options.myaddress, 0, "address to listen on", "address" }, - { "transport", 0, POPT_ARG_STRING, &options.transport, 0, "protocol transport", NULL }, - { "dbdir", 0, POPT_ARG_STRING, &options.db_dir, 0, "directory for the tdb files", NULL }, - { "dbdir-persistent", 0, POPT_ARG_STRING, &options.db_dir_persistent, 0, "directory for persistent tdb files", NULL }, - { "dbdir-state", 0, POPT_ARG_STRING, &options.db_dir_state, 0, "directory for internal state tdb files", NULL }, - { "reclock", 0, POPT_ARG_STRING, &options.recovery_lock, 0, "recovery lock", "lock" }, - { "nosetsched", 0, POPT_ARG_NONE, &options.nosetsched, 0, "disable setscheduler SCHED_FIFO call, use mmap for tdbs", NULL }, - { "start-as-disabled", 0, POPT_ARG_NONE, &options.start_as_disabled, 0, "Node starts in disabled state", NULL }, - { "start-as-stopped", 0, POPT_ARG_NONE, &options.start_as_stopped, 0, "Node starts in stopped state", NULL }, - { "no-lmaster", 0, POPT_ARG_NONE, &options.no_lmaster, 0, "disable lmaster role on this node", NULL }, - { "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL }, - { "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, 0, "log level of event script output", NULL }, + { "interactive", 'i', POPT_ARG_NONE, &interactive, 0, + "don't fork", NULL }, POPT_TABLEEND }; int opt, ret; |