CLEANUP: da: register the config keywords in da.c
No need to export the registration to haproxy.c, it can be done
locally.
diff --git a/include/import/da.h b/include/import/da.h
index 1c110d0..e1de985 100644
--- a/include/import/da.h
+++ b/include/import/da.h
@@ -5,7 +5,6 @@
#include <types/global.h>
#include <dac.h>
-void da_register_cfgkeywords(void);
int init_deviceatlas(void);
void deinit_deviceatlas(void);
#endif
diff --git a/src/da.c b/src/da.c
index 03b4b3e..435cc3f 100644
--- a/src/da.c
+++ b/src/da.c
@@ -52,13 +52,6 @@
return 0;
}
-static struct cfg_kw_list dacfg_kws = {{ }, {
- { CFG_GLOBAL, "deviceatlas-json-file", da_json_file },
- { CFG_GLOBAL, "deviceatlas-log-level", da_log_level },
- { CFG_GLOBAL, "deviceatlas-property-separator", da_property_separator },
- { 0, NULL, NULL },
-}};
-
static size_t da_haproxy_read(void *ctx, size_t len, char *buf)
{
return fread(buf, 1, len, ctx);
@@ -79,11 +72,6 @@
}
}
-void da_register_cfgkeywords(void)
-{
- cfg_register_keywords(&dacfg_kws);
-}
-
int init_deviceatlas(void)
{
da_status_t status = DA_SYS;
@@ -231,6 +219,13 @@
return 1;
}
+static struct cfg_kw_list dacfg_kws = {{ }, {
+ { CFG_GLOBAL, "deviceatlas-json-file", da_json_file },
+ { CFG_GLOBAL, "deviceatlas-log-level", da_log_level },
+ { CFG_GLOBAL, "deviceatlas-property-separator", da_property_separator },
+ { 0, NULL, NULL },
+}};
+
/* Note: must not be declared <const> as its list will be overwritten */
static struct sample_conv_kw_list conv_kws = {ILH, {
{ "da-csv", da_haproxy, ARG5(1,STR,STR,STR,STR,STR), NULL, SMP_T_STR, SMP_T_STR },
@@ -242,5 +237,6 @@
{
/* register sample fetch and format conversion keywords */
sample_register_convs(&conv_kws);
+ cfg_register_keywords(&dacfg_kws);
}
#endif
diff --git a/src/haproxy.c b/src/haproxy.c
index a8ea22e..7413d65 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -583,10 +583,6 @@
/* Initialise lua. */
hlua_init();
-#if defined(USE_DEVICEATLAS)
- /* Register deviceatlas config keywords */
- da_register_cfgkeywords();
-#endif
global.tune.options |= GTUNE_USE_SELECT; /* select() is always available */
#if defined(ENABLE_POLL)