]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD/MINOR: deviceatlas: enable thread support
authorDavid Carlier <dcarlier@afilias.info>
Mon, 27 Nov 2017 11:55:59 +0000 (11:55 +0000)
committerWilly Tarreau <w@1wt.eu>
Mon, 27 Nov 2017 13:22:21 +0000 (14:22 +0100)
DeviceAtlas detection being multi-thread safe, we enable the
new thread feature support.
Needs to be backported to 1.8 branch.

src/da.c

index 0669cba2f4e99acb36087dba329b11cc8f560417..685a79d196ae509b903ff0d85a21bbb3d63dcced 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -121,12 +121,6 @@ static int init_deviceatlas(void)
                size_t atlasimglen;
                da_status_t status;
 
-               if (global.nbthread > 1) {
-                       ha_alert("deviceatlas: multithreading is not supported for now.\n");
-                       err_code |= ERR_ALERT | ERR_FATAL;
-                       goto out;
-               }
-
                jsonp = fopen(global_deviceatlas.jsonpath, "r");
                if (jsonp == 0) {
                        ha_alert("deviceatlas : '%s' json file has invalid path or is not readable.\n",