From 6dfddacbc815ffa4c9ec1530a5c4ebbaabd7c8b2 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Tue, 10 Nov 2015 09:07:05 +0000 Subject: Remove plugin_dir configuration parameter The plugin_dir configuration parameter was added in commit 20056cc.. (keepalived version 1.1.8), but there has never been any implementation for the keyword. Since the functionality hasn't been implemented for over ten years, simply remove the keyword. Signed-off-by: Quentin Armitage (cherry picked from commit 545a66a5a2cee2f24341b2eb72b771e791707a7f) --- keepalived/core/global_data.c | 3 --- keepalived/core/global_parser.c | 6 ------ keepalived/include/check_api.h | 1 - keepalived/include/global_data.h | 2 -- 4 files changed, 12 deletions(-) diff --git a/keepalived/core/global_data.c b/keepalived/core/global_data.c index 0c2abce..1aa7af3 100644 --- a/keepalived/core/global_data.c +++ b/keepalived/core/global_data.c @@ -155,7 +155,6 @@ free_global_data(data_t * data) { free_list(data->email); FREE_PTR(data->router_id); - FREE_PTR(data->plugin_dir); FREE_PTR(data->email_from); FREE(data); } @@ -172,8 +171,6 @@ dump_global_data(data_t * data) } if (data->router_id) log_message(LOG_INFO, " Router ID = %s", data->router_id); - if (data->plugin_dir) - log_message(LOG_INFO, " Plugin dir = %s", data->plugin_dir); if (data->smtp_server.ss_family) log_message(LOG_INFO, " Smtp server = %s", inet_sockaddrtos(&data->smtp_server)); if (data->smtp_connection_to) diff --git a/keepalived/core/global_parser.c b/keepalived/core/global_parser.c index 8b354ff..ba14d59 100644 --- a/keepalived/core/global_parser.c +++ b/keepalived/core/global_parser.c @@ -46,11 +46,6 @@ routerid_handler(vector_t *strvec) global_data->router_id = set_value(strvec); } static void -plugin_handler(vector_t *strvec) -{ - global_data->plugin_dir = set_value(strvec); -} -static void emailfrom_handler(vector_t *strvec) { FREE_PTR(global_data->email_from); @@ -143,7 +138,6 @@ global_init_keywords(void) install_keyword_root("linkbeat_use_polling", use_polling_handler); install_keyword_root("global_defs", NULL); install_keyword("router_id", &routerid_handler); - install_keyword("plugin_dir", &plugin_handler); install_keyword("notification_email_from", &emailfrom_handler); install_keyword("smtp_server", &smtpip_handler); install_keyword("smtp_connect_timeout", &smtpto_handler); diff --git a/keepalived/include/check_api.h b/keepalived/include/check_api.h index 3dd5d78..e34389e 100644 --- a/keepalived/include/check_api.h +++ b/keepalived/include/check_api.h @@ -42,7 +42,6 @@ typedef struct _checker { void (*free_func) (void *); void (*dump_func) (void *); int (*launch) (struct _thread *); - int (*plugin_launch) (void *); virtual_server_t *vs; /* pointer to the checker thread virtualserver */ real_server_t *rs; /* pointer to the checker thread realserver */ void *data; diff --git a/keepalived/include/global_data.h b/keepalived/include/global_data.h index 9ea0867..2a4e561 100644 --- a/keepalived/include/global_data.h +++ b/keepalived/include/global_data.h @@ -36,7 +36,6 @@ /* constants */ #define DEFAULT_SMTP_SERVER 0x7f000001 #define DEFAULT_SMTP_CONNECTION_TIMEOUT (30 * TIMER_HZ) -#define DEFAULT_PLUGIN_DIR "/etc/keepalived/plugins" /* email link list */ typedef struct _email { @@ -47,7 +46,6 @@ typedef struct _email { typedef struct _data { int linkbeat_use_polling; char *router_id; - char *plugin_dir; char *email_from; struct sockaddr_storage smtp_server; long smtp_connection_to; -- 1.7.12.1