mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: 51d: make use of the late init registration

Browse Source 
This removes some #ifdefs from the main haproxy code path. Function
init_51degrees() now returns ERR_* instead of exit(1) on error, and
this function was made static and is not exported anymore.
This commit is contained in:
Willy Tarreau 2016-12-21 20:30:05 +01:00
parent dc2ed47163
commit 9f3f2549fb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/import/51d.h
View File

@ -3,7 +3,6 @@
#include <51Degrees.h> #include <51Degrees.h>
int init_51degrees(void);
void deinit_51degrees(void); void deinit_51degrees(void);
#endif #endif

11
src/51d.c
View File

@ -3,6 +3,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/chunk.h> #include <common/chunk.h>
#include <common/buffer.h> #include <common/buffer.h>
#include <common/errors.h>
#include <proto/arg.h> #include <proto/arg.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/proto_http.h> #include <proto/proto_http.h>
@ -507,7 +508,10 @@ void _51d_init_http_headers()
} }
#endif #endif
int init_51degrees(void) /*
* module init / deinit functions. Returns 0 if OK, or a combination of ERR_*.
*/
static int init_51degrees(void)
{ {
int i = 0; int i = 0;
struct chunk *temp; struct chunk *temp;
@ -516,7 +520,7 @@ int init_51degrees(void)
fiftyoneDegreesDataSetInitStatus _51d_dataset_status = DATA_SET_INIT_STATUS_NOT_SET; fiftyoneDegreesDataSetInitStatus _51d_dataset_status = DATA_SET_INIT_STATUS_NOT_SET;
if (!global._51degrees.data_file_path) if (!global._51degrees.data_file_path)
return -1; return 0;
if (!LIST_ISEMPTY(&global._51degrees.property_names)) { if (!LIST_ISEMPTY(&global._51degrees.property_names)) {
i = 0; i = 0;
@ -582,7 +586,7 @@ int init_51degrees(void)
Alert("51Degrees Setup - Error reading 51Degrees data file. %s\n", temp->str); Alert("51Degrees Setup - Error reading 51Degrees data file. %s\n", temp->str);
else else
Alert("51Degrees Setup - Error reading 51Degrees data file.\n"); Alert("51Degrees Setup - Error reading 51Degrees data file.\n");
exit(1); return ERR_ALERT | ERR_FATAL;
} }
free(_51d_property_list); free(_51d_property_list);
@ -649,4 +653,5 @@ static void __51d_init(void)
sample_register_convs(&conv_kws); sample_register_convs(&conv_kws);
cfg_register_keywords(&_51dcfg_kws); cfg_register_keywords(&_51dcfg_kws);
hap_register_build_opts("Built with 51Degrees support.", 0); hap_register_build_opts("Built with 51Degrees support.", 0);
hap_register_post_check(init_51degrees);
} }

3
src/haproxy.c
View File

@ -929,9 +929,6 @@ static void init(int argc, char **argv)
#if defined(USE_DEVICEATLAS) #if defined(USE_DEVICEATLAS)
init_deviceatlas(); init_deviceatlas();
#endif #endif
#ifdef USE_51DEGREES
init_51degrees();
#endif
list_for_each_entry(pcf, &post_check_list, list) { list_for_each_entry(pcf, &post_check_list, list) {
err_code |= pcf->fct(); err_code |= pcf->fct();