RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: init: DeviceAtlas initialization

Browse Source 
This diff initialises few DeviceAtlas struct fields member with
their inherent default values.
Furthermore, the specific DeviceAtlas configuration keywords are
registered and the module is initialised and all necessary
resources are freed during the deinit phase.
This commit is contained in:
David Carlier 2015-06-01 13:57:22 +02:00 committed by Willy Tarreau
parent 4542b10ae1
commit 4a02641a86
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/haproxy.c
View File

@ -111,6 +111,10 @@
#include <proto/ssl_sock.h>
#endif
#ifdef USE_DEVICEATLAS
#include <import/da.h>
#endif
/*********************************************************************/
extern const struct comp_algo comp_algos[];
@ -169,6 +173,14 @@ struct global global = {
#ifdef DEFAULT_MAXSSLCONN
.maxsslconn = DEFAULT_MAXSSLCONN,
#endif
#endif
#ifdef USE_DEVICEATLAS
.deviceatlas = {
.loglevel = DA_SEV_INFO,
.useragentid = 0,
.jsonpath = 0,
.separator = '|',
},
#endif
/* others NULL OK */
};
@ -571,6 +583,10 @@ 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)
@ -785,6 +801,9 @@ void init(int argc, char **argv)
/* now we know the buffer size, we can initialize the channels and buffers */
init_buffer();
#if defined(USE_DEVICEATLAS)
init_deviceatlas();
#endif
if (have_appsession)
appsession_init();
@ -1415,6 +1434,10 @@ void deinit(void)
protocol_unbind_all();
#if defined(USE_DEVICEATLAS)
deinit_deviceatlas();
#endif
free(global.log_send_hostname); global.log_send_hostname = NULL;
free(global.log_tag); global.log_tag = NULL;
free(global.chroot); global.chroot = NULL;