sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

ctdb-tests: Drop ctdbd --event-script-dir option

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2018-03-09 16:27:32 +11:00 committed by Amitay Isaacs
parent 3df3678101
commit aa961e8807
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ctdb/doc/ctdbd.1.xml
View File

@ -106,23 +106,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>--event-script-dir=<parameter>DIRECTORY</parameter></term>
<listitem>
<para>
DIRECTORY where the CTDB event scripts are stored. See the
<citetitle>EVENT SCRIPTS</citetitle> section in
<citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> for more information.
</para>
<para>
Default is <envar>CTDB_BASE</envar>/events.d, so usually
<filename>/usr/local/etc/ctdb/events.d</filename>, which is part of
the CTDB installation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--listen=<parameter>IPADDR</parameter></term>
<listitem>

12
ctdb/server/ctdbd.c
View File

@ -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,16 +313,13 @@ 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",
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"));
DBG_ERR("Out of memory\n");
exit(1);
}
}
if (options.notification_script != NULL) {
ret = ctdb_set_notification_script(ctdb, options.notification_script);