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-daemon: Drop ctdbd --notification-script command-line option

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-03-29 15:25:47 +11:00 committed by Martin Schwenke
parent e5af067866
commit 0349d65854
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,26 +300,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>--notification-script=<parameter>FILENAME</parameter></term>
<listitem>
<para>
FILENAME specifying a script to be invoked by ctdbd when
certain state changes occur.
</para>
<para>
The default is
<filename>/usr/local/etc/ctdb/notify.sh</filename>.
</para>
<para>
Please see the <citetitle>NOTIFICATIONS</citetitle>
section in <citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> for more
information.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--reclock=<parameter>LOCK</parameter></term>
<listitem>

13
ctdb/server/ctdbd.c
View File

@ -43,7 +43,6 @@ static struct {
const char *debuglevel;
const char *transport;
const char *myaddress;
const char *notification_script;
const char *logging;
const char *recovery_lock;
const char *db_dir;
@ -115,7 +114,6 @@ int main(int argc, const char *argv[])
{ "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 },
{ "notification-script", 0, POPT_ARG_STRING, &options.notification_script, 0, "notification script", "filename" },
{ "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 },
@ -312,14 +310,9 @@ int main(int argc, const char *argv[])
exit(1);
}
if (options.notification_script != NULL) {
ctdb->notification_script = talloc_strdup(
ctdb, options.notification_script);
} else {
ctdb->notification_script = talloc_asprintf(ctdb,
"%s/notify.sh",
ctdb_base);
}
ctdb->notification_script = talloc_asprintf(ctdb,
"%s/notify.sh",
ctdb_base);
if (ctdb->notification_script == NULL) {
D_ERR("Unable to set notification script\n");
exit(1);