mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-28 17:21:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: da: register the config keywords in da.c

Browse Source 
No need to export the registration to haproxy.c, it can be done
locally.
This commit is contained in:
Willy Tarreau 2015-06-01 15:42:29 +02:00
parent f63386ad27
commit 0d74f77ee7
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/import/da.h
View File

@ -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

20
src/da.c
View File

@ -52,13 +52,6 @@ static int da_property_separator(char **args, int section_type, struct proxy *cu
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 @@ static void da_haproxy_log(da_severity_t severity, da_status_t status,
}
}
void da_register_cfgkeywords(void)
{
cfg_register_keywords(&dacfg_kws);
}
int init_deviceatlas(void)
{
da_status_t status = DA_SYS;
@ -231,6 +219,13 @@ static int da_haproxy(const struct arg *args, struct sample *smp, void *private)
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 @@ static void __da_init(void)
{
/* register sample fetch and format conversion keywords */
sample_register_convs(&conv_kws);
cfg_register_keywords(&dacfg_kws);
}
#endif

4
src/haproxy.c
View File

@ -583,10 +583,6 @@ void init(int argc, char **argv)
/* 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)