REORG: include: move log.h to haproxy/log{,-t}.h

The current state of the logging is a real mess. The main problem is
that almost all files include log.h just in order to have access to
the alert/warning functions like ha_alert() etc, and don't care about
logs. But log.h also deals with real logging as well as log-format and
depends on stream.h and various other things. As such it forces a few
heavy files like stream.h to be loaded early and to hide missing
dependencies depending where it's loaded. Among the missing ones is
syslog.h which was often automatically included resulting in no less
than 3 users missing it.

Among 76 users, only 5 could be removed, and probably 70 don't need the
full set of dependencies.

A good approach would consist in splitting that file in 3 parts:
  - one for error output ("errors" ?).
  - one for log_format processing
  - and one for actual logging.

diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 9aec53888c078c8ad930c8a1f88906b1ac6931fc..740767454779235e70cc891d91b196b264589e4b 100644 (file)
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -18,12 +18,12 @@
 
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
+#include <haproxy/log.h>
 #include <haproxy/time.h>
 
 #include <types/stream.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <proto/spoe.h>
 
 #include <api.h>

diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 86f87bf42bb17ec68a37fa482aa268181a3e1b3b..9dd6363232c2aa1d8dc044b64ab9508f46dc0023 100644 (file)
--- a/include/common/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -24,8 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/list-t.h>
-
-#include <proto/log.h>
+#include <haproxy/log.h>
 #include <proto/proxy.h>
 
 /* configuration sections */

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 0c0404313b475d1bdd3d06371a37e8a4493ab8a6..24cad0f80de52690b809c8bf46c1a53c10ec0d5d 100644 (file)
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -27,6 +27,7 @@
 #include <haproxy/api.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/fd.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>

diff --git a/include/haproxy/defaults.h b/include/haproxy/defaults.h
index e359a3ea24f6ce941938e06093208ad9377691f9..ef393dcb373fb92e4e19f5b26e81b114e2a9d28d 100644 (file)
--- a/include/haproxy/defaults.h
+++ b/include/haproxy/defaults.h
@@ -74,6 +74,11 @@
 #define MAX_SYSLOG_LEN          1024
 #endif
 
+/* 64kB to archive startup-logs seems way more than enough */
+#ifndef STARTUP_LOG_SIZE
+#define STARTUP_LOG_SIZE        65536
+#endif
+
 // maximum line size when parsing config
 #ifndef LINESIZE
 #define LINESIZE       2048

diff --git a/include/types/log.h b/include/haproxy/log-t.h
similarity index 69%
rename from include/types/log.h
rename to include/haproxy/log-t.h
index 28992db1347f632045db2da0e03840a7295b8b7b..c3efa2c7de1756921d220490c15b0d080587f92b 100644 (file)
--- a/include/types/log.h
+++ b/include/haproxy/log-t.h
@@ -1,34 +1,36 @@
 /*
-  include/types/log.h
-  This file contains definitions of log-related structures and macros.
-
-  Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * include/haproxy/log-t.h
+ * This file contains definitions of log-related structures and macros.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#ifndef _TYPES_LOG_H
-#define _TYPES_LOG_H
+#ifndef _HAPROXY_LOG_T_H
+#define _HAPROXY_LOG_T_H
 
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
-#include <haproxy/api-t.h>
-#include <haproxy/thread.h>
+
 #include <haproxy/list-t.h>
 #include <haproxy/ring-t.h>
+#include <haproxy/thread-t.h>
+#include <haproxy/api-t.h>
+
 
 #define NB_LOG_FACILITIES       24
 #define NB_LOG_LEVELS           8
@@ -36,13 +38,35 @@
 #define SYSLOG_PORT             514
 #define UNIQUEID_LEN            128
 
-/* 64kB to archive startup-logs seems way more than enough */
-#ifndef STARTUP_LOG_SIZE
-#define STARTUP_LOG_SIZE        65536
-#endif
+/* flags used in logformat_node->options */
+#define LOG_OPT_HEXA            0x00000001
+#define LOG_OPT_MANDATORY       0x00000002
+#define LOG_OPT_QUOTE           0x00000004
+#define LOG_OPT_REQ_CAP         0x00000008
+#define LOG_OPT_RES_CAP         0x00000010
+#define LOG_OPT_HTTP            0x00000020
+#define LOG_OPT_ESC             0x00000040
+
+
+/* Fields that need to be extracted from the incoming connection or request for
+ * logging or for sending specific header information. They're set in px->to_log
+ * and appear as flags in session->logs.logwait, which are removed once the
+ * required information has been collected.
+ */
+#define LW_INIT             1        /* anything */
+#define LW_CLIP             2        /* CLient IP */
+#define LW_SVIP             4        /* SerVer IP */
+#define LW_SVID             8        /* server ID */
+#define LW_REQ             16        /* http REQuest */
+#define LW_RESP            32        /* http RESPonse */
+#define LW_BYTES          256        /* bytes read from server */
+#define LW_COOKIE         512        /* captured cookie */
+#define LW_REQHDR        1024        /* request header(s) */
+#define LW_RSPHDR        2048        /* response header(s) */
+#define LW_BCKIP         4096        /* backend IP */
+#define LW_FRTIP         8192        /* frontend IP */
+#define LW_XPRT         16384        /* transport layer information (eg: SSL) */
 
-/* The array containing the names of the log levels. */
-extern const char *log_levels[];
 
 /* enum for log format */
 enum {
@@ -60,7 +84,7 @@ enum log_tgt {
        LOG_TARGET_BUFFER,    // ring buffer
 };
 
-/* lists of fields that can be logged */
+/* lists of fields that can be logged, for logformat_node->type */
 enum {
 
        LOG_FMT_TEXT = 0, /* raw text */
@@ -156,34 +180,6 @@ struct logformat_node {
        void *expr;    // for use with LOG_FMT_EXPR
 };
 
-#define LOG_OPT_HEXA           0x00000001
-#define LOG_OPT_MANDATORY      0x00000002
-#define LOG_OPT_QUOTE          0x00000004
-#define LOG_OPT_REQ_CAP         0x00000008
-#define LOG_OPT_RES_CAP         0x00000010
-#define LOG_OPT_HTTP            0x00000020
-#define LOG_OPT_ESC             0x00000040
-
-
-/* Fields that need to be extracted from the incoming connection or request for
- * logging or for sending specific header information. They're set in px->to_log
- * and appear as flags in session->logs.logwait, which are removed once the
- * required information has been collected.
- */
-#define LW_INIT                1       /* anything */
-#define LW_CLIP                2       /* CLient IP */
-#define LW_SVIP                4       /* SerVer IP */
-#define LW_SVID                8       /* server ID */
-#define        LW_REQ          16      /* http REQuest */
-#define LW_RESP                32      /* http RESPonse */
-#define LW_BYTES       256     /* bytes read from server */
-#define LW_COOKIE      512     /* captured cookie */
-#define LW_REQHDR      1024    /* request header(s) */
-#define LW_RSPHDR      2048    /* response header(s) */
-#define LW_BCKIP       4096    /* backend IP */
-#define LW_FRTIP       8192    /* frontend IP */
-#define LW_XPRT                16384   /* transport layer information (eg: SSL) */
-
 /* Range of indexes for log sampling. */
 struct smp_log_range {
        unsigned int low;        /* Low limit of the indexes of this range. */
@@ -223,7 +219,7 @@ struct logsrv {
        __decl_thread(HA_SPINLOCK_T lock);
 };
 
-#endif /* _TYPES_LOG_H */
+#endif /* _HAPROXY_LOG_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/log.h b/include/haproxy/log.h
similarity index 81%
rename from include/proto/log.h
rename to include/haproxy/log.h
index 48802dc10ce0b40eab63978a09c55cf37f3a514f..caddd95b87b381a5c1c9ea6d903175f82e213a3b 100644 (file)
--- a/include/proto/log.h
+++ b/include/haproxy/log.h
@@ -1,44 +1,40 @@
 /*
-  include/proto/log.h
-  This file contains definitions of log-related functions, structures,
-  and macros.
-
-  Copyright (C) 2000-2008 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef _PROTO_LOG_H
-#define _PROTO_LOG_H
-
-#include <stdio.h>
+ * include/haproxy/log.h
+ * This file contains definitions of log-related functions.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _HAPROXY_LOG_H
+#define _HAPROXY_LOG_H
+
 #include <syslog.h>
 
 #include <haproxy/api.h>
-#include <haproxy/pool.h>
+#include <haproxy/log-t.h>
+#include <haproxy/pool-t.h>
 #include <haproxy/thread-t.h>
-
-#include <types/log.h>
-#include <types/proxy.h>
-#include <types/stream.h>
-
 #include <proto/stream.h>
+#include <types/proxy.h>
 
 extern struct pool_head *pool_head_requri;
 extern struct pool_head *pool_head_uniqueid;
 
+extern const char *log_levels[];
 extern char *log_format;
 extern char default_tcp_log_format[];
 extern char default_http_log_format[];
@@ -54,32 +50,13 @@ extern THREAD_LOCAL char *logline;
 extern THREAD_LOCAL char *logline_rfc5424;
 
 
-/*
- * Test if <idx> index numbered from 0 is in <rg> range with low and high
- * limits of indexes numbered from 1.
- */
-static inline int in_smp_log_range(struct smp_log_range *rg, unsigned int idx)
-{
-       if (idx + 1 <= rg->high && idx + 1 >= rg->low)
-               return 1;
-       return 0;
-}
-
 /* Initialize/Deinitialize log buffers used for syslog messages */
 int init_log_buffers();
 void deinit_log_buffers();
 
-/*
- * Builds a log line.
- */
+/* build a log line for the session and an optional stream */
 int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t maxsize, struct list *list_format);
 
-static inline int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list_format)
-{
-       return sess_build_logline(strm_sess(s), s, dst, maxsize, list_format);
-}
-
-
 /*
  * send a log for the stream when we have enough info about it.
  * Will not log if the frontend has no log defined.
@@ -191,7 +168,26 @@ char *update_log_hdr(const time_t time);
 char * get_format_pid_sep1(int format, size_t *len);
 char * get_format_pid_sep2(int format, size_t *len);
 
-#endif /* _PROTO_LOG_H */
+/*
+ * Test if <idx> index numbered from 0 is in <rg> range with low and high
+ * limits of indexes numbered from 1.
+ */
+static inline int in_smp_log_range(struct smp_log_range *rg, unsigned int idx)
+{
+       if (idx + 1 <= rg->high && idx + 1 >= rg->low)
+               return 1;
+       return 0;
+}
+
+/*
+ * Builds a log line for the stream (must be valid).
+ */
+static inline int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list_format)
+{
+       return sess_build_logline(strm_sess(s), s, dst, maxsize, list_format);
+}
+
+#endif /* _HAPROXY_LOG_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/trace.h b/include/haproxy/trace.h
index 0367aa73eebd9300eb550c2b9103f0319785d55c..ae5a3c189b9806120e8bb671b818cc31b9f299fd 100644 (file)
--- a/include/haproxy/trace.h
+++ b/include/haproxy/trace.h
@@ -29,7 +29,6 @@
 #include <haproxy/thread-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace-t.h>
-#include <types/log.h>
 
 /* Make a string from the location of the trace producer as "file:line" */
 #define TRC_LOC  _TRC_LOC(__FILE__, __LINE__)

diff --git a/include/proto/server.h b/include/proto/server.h
index 4d78c1d279ca20bc847c23f8c18388d72d840ebf..34314236fce85b191ccde2d03185f69a3afb5da7 100644 (file)
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -27,13 +27,13 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/dns-t.h>
+#include <haproxy/task.h>
 #include <haproxy/time.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
 
 #include <proto/queue.h>
-#include <proto/log.h>
 #include <haproxy/freq_ctr.h>
 
 

diff --git a/include/types/proxy.h b/include/types/proxy.h
index b86df8d92d40b0b6f29b3845758cfa3fe51aaefe..6bcad167c005006ae464e345169adb7f85563330 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -43,7 +43,6 @@
 #include <haproxy/acl-t.h>
 #include <types/backend.h>
 #include <haproxy/freq_ctr-t.h>
-#include <types/log.h>
 #include <haproxy/sample-t.h>
 #include <types/server.h>
 #include <haproxy/stick_table-t.h>

diff --git a/include/types/spoe.h b/include/types/spoe.h
index 1538a729a96634aae76da6dd38a25c5624a8aec1..1f0a84aaf691440f9ec9669f457a5eb20098254e 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -30,7 +30,6 @@
 #include <haproxy/thread.h>
 
 #include <haproxy/freq_ctr-t.h>
-#include <types/log.h>
 #include <types/proxy.h>
 #include <haproxy/sample-t.h>
 #include <types/stream.h>

diff --git a/src/51d.c b/src/51d.c
index 37124ea37f0b3e0f706f0894d7e26ef8bfbe6911..12f40ea09218fdcc6580a5df0448bf74d0c1d14c 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -8,10 +8,10 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/log.h>
 #include <haproxy/thread.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <haproxy/sample.h>
 #include <import/xxhash.h>
 #include <import/lru.h>

diff --git a/src/acl.c b/src/acl.c
index 275087de7ed5a880a525fee9033249fa55726fbe..f3332ac2715e4ddca7ab82bbfb9b706c8b9655ee 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -18,13 +18,13 @@
 #include <haproxy/auth.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/pattern.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/global.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stick_table.h>

diff --git a/src/action.c b/src/action.c
index fa3b4f7774825205224d4891b52655064a2efe5d..999790356fca5f98123778e390ce81cc74c01915 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -15,10 +15,10 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/auth.c b/src/auth.c
index faac16d4e2c63cd715a2bdc620e12bcae2367e87..646c0109eb8f07e336eae7368d3d8edc377762a2 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -29,11 +29,10 @@
 #include <haproxy/api.h>
 #include <haproxy/global.h>
 #include <haproxy/errors.h>
+#include <haproxy/log.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/thread.h>
 
-#include <proto/log.h>
-
 struct userlist *userlist = NULL;    /* list of all existing userlists */
 
 #ifdef USE_LIBCRYPT

diff --git a/src/backend.c b/src/backend.c
index f79ac18e54f067408ebecd13b996ddf39049f2b3..423163f26a561e761ba113a84bd4acc7ff13b40b 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -34,6 +34,7 @@
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/lb_map.h>
+#include <haproxy/log.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
 #include <haproxy/session.h>
@@ -48,7 +49,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>

diff --git a/src/cache.c b/src/cache.c
index 17d015afa4c6ed7cbf3fd1732e4ab9e396133148..0858a8de8ea791a20150a61e651474653dde39a6 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -18,6 +18,7 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream_interface.h>
 #include <import/eb32tree.h>
@@ -26,7 +27,6 @@
 #include <types/proxy.h>
 
 #include <proto/proxy.h>
-#include <proto/log.h>
 #include <proto/stream.h>
 
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 8bd60b7cbd68d819f689c30eac306611bd3f1bd1..a15028b2e2366080ce5ac7420440ffde0b0820bd 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -55,6 +55,7 @@
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/lb_map.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers-t.h>
@@ -71,7 +72,6 @@
 #include <haproxy/global.h>
 
 #include <proto/backend.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <haproxy/peers.h>

diff --git a/src/check.c b/src/check.c
index 7381a324ff48e0891752464c916ee7159e0ad831..6b4f9faecf198b9d075bf7f4d97fb15d05c17084 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -46,6 +46,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/h1.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
@@ -58,14 +59,12 @@
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <proto/queue.h>
 #include <haproxy/port_range.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/log.h>
 #include <haproxy/proto_udp.h>
 #include <haproxy/sample.h>
 

diff --git a/src/cli.c b/src/cli.c
index 9e6b56ac35b807f020016225e83aafe486e3c2fd..e5413e9f00c3c8ba678974ea26c3ccc204b8f205 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -36,6 +36,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
@@ -57,7 +58,6 @@
 #include <haproxy/compression.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>

diff --git a/src/da.c b/src/da.c
index 1d62ade4a096664b12782a3a89f990bc9028bc39..6090851abc8079229dbf9d9071fc165acbeb685a 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -8,9 +8,9 @@
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <haproxy/sample.h>
 #include <dac.h>
 

diff --git a/src/debug.c b/src/debug.c
index 4f7e6cea74fe8b6e204911f25345d0e21386f481..6829eb286203b28a405dd0ac3424b7d75e8b2f3c 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <syslog.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -24,6 +25,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/debug.h>
 #include <haproxy/hlua.h>
+#include <haproxy/log.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>

diff --git a/src/dns.c b/src/dns.c
index 7658f6f846f0515b549e640cc9885f80fa6a6906..bcbc435aef3d785c0658f5fd8fc878e657fe6a24 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -28,6 +28,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
@@ -41,7 +42,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
 #include <proto/proxy.h>

diff --git a/src/ev_evports.c b/src/ev_evports.c
index 3d60247125e9ee02c716851386224c7ca0dd0ed4..81cbe5138f01d5ec8001cf20ed06603ca87a9c4b 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -28,7 +28,6 @@
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 
 /*
  * Private data:

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 629c67792b6815a7195ff86fa2219bba3aa0b1a8..d7183c5fd6a04eca1e818c162bc8c2cc8ced2ed2 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -19,6 +19,7 @@
 #include <haproxy/filters.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/log.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
@@ -26,7 +27,6 @@
 
 #include <haproxy/global.h>
 
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 

diff --git a/src/fd.c b/src/fd.c
index 82f619625be7b09ffb6a14360b787f479cf26ef3..d3940bb12ad1e2f56014d8506afd0c447fd53a03 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -92,7 +92,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/port_range.h>
 
 struct fdtab *fdtab = NULL;     /* array of all the file descriptors */

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index f532d2d8516bb3da15e41f2e25162a781b883a65..f5094c02ffb12046cd8302e31d420a0db4d051e2 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -19,6 +19,7 @@
 #include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/signal.h>
 #include <haproxy/thread.h>
@@ -37,7 +38,6 @@
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 2f55b73d1a1977f876249a26d00b36625d2b916c..01278bb0bac9a9f8d49dc021639fc4756eb94d15 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -18,6 +18,7 @@
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
@@ -25,7 +26,6 @@
 #include <types/proxy.h>
 #include <types/stream.h>
 
-#include <proto/log.h>
 #include <proto/stream.h>
 
 const char *trace_flt_id = "trace filter";

diff --git a/src/frontend.c b/src/frontend.c
index 09adbea1558c0a67332a24330f1ff6c0a0569afb..8252c81be1690ddf5364e0437c4ae17ce60edb5b 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -27,6 +27,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_ana.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -37,7 +38,6 @@
 
 #include <haproxy/arg.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 6488df9b3afa4117fd44b94dc5606f29ed16b582..9e2f94a2cb9a5fca23c871e42ed52fdf15ae12e1 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -97,6 +97,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/mworker.h>
 #include <haproxy/namespace.h>
 #include <haproxy/net_helper.h>
@@ -123,7 +124,6 @@
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index c14c885ff89315cac1f4b0b56b17181d6f3963a9..12bca02c3a0bfd19290d182856523f6f0afa1d48 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -21,6 +21,7 @@
 #include <haproxy/cli-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/http.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>

diff --git a/src/http_act.c b/src/http_act.c
index 06ab3c271c0fa7a2848eb4c7a8d03a6a0ca6c532..a688acbaa043145b3847dfbc98806ee627e1eddd 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -38,7 +38,6 @@
 #include <haproxy/capture-t.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.

diff --git a/src/http_ana.c b/src/http_ana.c
index 8e8dd2fa0f62048945306c1361e6b79b1db06c53..373e399a77b67b6420c461f5f24952a7a34e3750 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -22,6 +22,7 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>
@@ -31,7 +32,6 @@
 
 #include <haproxy/capture-t.h>
 
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 65fbe877ec2fdcab2a74b6e98f5238c25fd64d5c..812ede5c7ebf4bfa91430922f04dd7f53f38bd6e 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -37,7 +37,6 @@
 #include <haproxy/version.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <proto/stream.h>
 
 

diff --git a/src/listener.c b/src/listener.c
index ab0a4a726d6b04e52d923d1a70b4fbea320f9d55..17796429696059bf6756e0fd3abb36abebc3c1e9 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -26,6 +26,7 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -34,7 +35,6 @@
 
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_sockpair.h>
 #include <haproxy/sample.h>

diff --git a/src/log.c b/src/log.c
index 4f095cafd67c14c11d44e04f5a406c29a5af68fe..4027db28b8f6807641d43812e036e52174c8e159 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -29,6 +29,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http.h>
+#include <haproxy/log.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
@@ -36,10 +37,8 @@
 #include <haproxy/version.h>
 
 #include <haproxy/global.h>
-#include <types/log.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/ring.h>
 #include <haproxy/sample.h>
 #include <haproxy/sink.h>

diff --git a/src/map.c b/src/map.c
index 7beefde7461dd52e70668e563c4410224fc8f996..243676d2e16e0c2b2608c42be344911c53620738 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -23,7 +23,6 @@
 #include <haproxy/tools.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <haproxy/sample.h>
 
 /* Parse an IPv4 or IPv6 address and store it into the sample.

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 2bb58626208e461477572fe5514bd2247fe2e024..e13ce55b5d2e5248a1d1878a9ccc7b55a94fe2d4 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -21,6 +21,7 @@
 #include <haproxy/htx.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/session-t.h>
@@ -29,7 +30,6 @@
 
 #include <types/proxy.h>
 
-#include <proto/log.h>
 #include <proto/stream.h>
 #include <haproxy/trace.h>
 

diff --git a/src/mux_h1.c b/src/mux_h1.c
index ada8bb18b63567348a6f8e5b3aaba0fe1db284bb..75a640847ac19c0e0f95998f28970ec53b129f20 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -24,7 +24,7 @@
 #include <types/proxy.h>
 
 #include <haproxy/http_htx.h>
-#include <proto/log.h>
+#include <haproxy/log.h>
 #include <haproxy/session-t.h>
 #include <proto/stream.h>
 #include <haproxy/stream_interface.h>

diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index 0a448beab94e2a8b9b4fd68e3ca86ba572ba5dbc..800624f940d811c1f3305d6ebcee7a248b34434a 100644 (file)
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -23,9 +23,9 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/log.h>
 #include <haproxy/mworker.h>
 
-#include <proto/log.h>
 
 static int use_program = 0; /* do we use the program section ? */
 

diff --git a/src/mworker.c b/src/mworker.c
index bccffaa58319c8de4a1c73a20bfff696c543b6e5..d891f2fda30ac6f9fe304174358c0785fb02353d 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -22,6 +22,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/signal.h>
@@ -31,7 +32,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 

diff --git a/src/namespace.c b/src/namespace.c
index dfda7a5e324925fb5840d4dc6fc33b7462ef641e..8b7190ca0ee59e004e20dc8b6fd61a0bc646dcb6 100644 (file)
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -14,8 +14,8 @@
 #include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/errors.h>
+#include <haproxy/log.h>
 #include <haproxy/signal.h>
-#include <proto/log.h>
 
 /* Opens the namespace <ns_name> and returns the FD or -1 in case of error
  * (check errno).

diff --git a/src/pattern.c b/src/pattern.c
index 0ec22c10db2a837b19be7a183d0f0b3e658199cb..bbd7faa2687fdd614bb26324329eb192e0c58c93 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -16,12 +16,12 @@
 
 #include <haproxy/api.h>
 #include <haproxy/global.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 
-#include <proto/log.h>
 #include <haproxy/sample.h>
 
 #include <import/ebsttree.h>

diff --git a/src/peers.c b/src/peers.c
index c5d8095915bdcd72eb1d5bc744e6c05c65794f86..633f9aeb720b0e1e76f1c16311fa26bc13c14777 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -26,6 +26,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/dict.h>
 #include <haproxy/frontend.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
@@ -39,7 +40,6 @@
 #include <haproxy/thread.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>

diff --git a/src/pool.c b/src/pool.c
index 41d9c449a227ef9f0365adf2718e313fb01f66ac..78809bb7a51a659572e5bd4b7152f0a9909ece91 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -21,13 +21,13 @@
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/activity-t.h>
 
-#include <proto/log.h>
 
 #ifdef CONFIG_HAP_LOCAL_POOLS
 /* These are the most common pools, expected to be initialized first. These

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index cb1853681b7badb31054c7efc0c448d9a09619fe..c72c6ac20cb4b7a56f319c8fd1c3c84ed45c00aa 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -32,13 +32,13 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
 
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 
 static void sockpair_add_listener(struct listener *listener, int port);

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index b25779ccd4cee8f612f838e0c4617dcfcbb12a70..63624f600b08537435a8d1cf5f3120f99b28ea5a 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -39,6 +39,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
@@ -47,7 +48,6 @@
 
 #include <haproxy/arg.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 33c79e9a7a88c8f24bb21123e3f9cd786f2e7ea9..ea516ba1972a64d4b5bbe1f19b0018f7b314ada8 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -32,12 +32,12 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
 
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/protocol.h>
 
 static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen);

diff --git a/src/proxy.c b/src/proxy.c
index 78d91e6e25e5e1066253436fc8bb7210b21d026f..6a0a158a4a9200f7398b6e207356036fcc5c3317 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,6 +26,7 @@
 #include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/pool.h>
@@ -41,7 +42,6 @@
 
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/log.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/server.h>

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 3453aac1ba6e968afc40fb37505cb04c5e40beb4..099f50341e76fbe73641801ae4e0b9837b544c9b 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -26,6 +26,7 @@
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
+#include <haproxy/log.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -33,7 +34,6 @@
 
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <haproxy/pipe.h>
 
 

diff --git a/src/regex.c b/src/regex.c
index b2f325d7a51776d9e67efe39c9ed6c9a13be5cf8..3510f72c88e338eff7b68becc738858bc869b9d8 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -15,9 +15,9 @@
 #include <string.h>
 
 #include <haproxy/api.h>
+#include <haproxy/log.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
-#include <proto/log.h>
 
 /* regex trash buffer used by various regex tests */
 THREAD_LOCAL regmatch_t pmatch[MAX_MATCH];  /* rm_so, rm_eo for regular expressions */

diff --git a/src/sample.c b/src/sample.c
index 23f7bf267bf71cbe1479e53511e468931c0df441..99b6fd548f91732dd2e61dd9e2c10a5ac3c9b21e 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -24,6 +24,7 @@
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/protobuf.h>
 #include <haproxy/regex.h>
@@ -34,7 +35,6 @@
 #include <haproxy/base64.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/sink.h>
 #include <haproxy/stick_table.h>

diff --git a/src/session.c b/src/session.c
index 58e55ee6d5e0076518c65a07e89e8723204e126f..4169870f9dfc074d276ac2a50582c8880269cbfd 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -15,12 +15,12 @@
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 

diff --git a/src/signal.c b/src/signal.c
index 6d015481521637b87e8241879937eaf4cc0842be..1f8ec834c1b7b9266f141e03286df97105b60375 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -13,9 +13,9 @@
 #include <signal.h>
 #include <string.h>
 
+#include <haproxy/log.h>
 #include <haproxy/task.h>
 #include <haproxy/signal.h>
-#include <proto/log.h>
 
 /* Principle : we keep an in-order list of the first occurrence of all received
  * signals. All occurrences of a same signal are grouped though. The signal

diff --git a/src/sink.c b/src/sink.c
index 93beccf08b9bc6a1fba028907b26beb11d54dab2..b6e1b857e68a1c7614a7686bfd1db4945957c7c0 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -23,8 +23,8 @@
 #include <haproxy/cli.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/time.h>
-#include <proto/log.h>
 #include <haproxy/ring.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 43fe01d3bd893b6aeb1e629e214a6f68fdb2fde2..d2fd4e1811fc014e673b4e85647fd3aa62dc7687 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <unistd.h>
 
 #include <sys/stat.h>

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 3890ca833e2b6981109459c9fbb830042024e171..8e6a2e42d1215c2676f403e7c00e5eebe5bc121d 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index a586b62553f00157b28d8ce4ed22bd10b5616d8e..1b1b0e47d7f9ffce7568282be7805f02b5f2f308 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -53,6 +53,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/shctx.h>
@@ -77,7 +78,6 @@
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/server.h>
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 

diff --git a/src/stats.c b/src/stats.c
index 573721566fe16ed5e3f98e646816ca64b2a9e5bb..40ea9c8bea861901ba1eeb74ff3afec412478ade 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -41,6 +41,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/session.h>
@@ -58,7 +59,6 @@
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 3a8d62f4490be75ab99d3843d34dda43eb552f01..fdf1b585ad04794e0e5159fdd636cd958e56671c 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -21,6 +21,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/peers.h>
 #include <haproxy/stats-t.h>
@@ -34,7 +35,6 @@
 #include <import/ebsttree.h>
 
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>

diff --git a/src/stream.c b/src/stream.c
index fc2798d098c5726444906ab8754cf83fc8692b62..eab3356acbdc1b8cd5444df787669b80bfd8d05f 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -36,6 +36,7 @@
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
@@ -49,7 +50,6 @@
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/log.h>
 #include <proto/stream.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index e7abdd76f03e404ba44de3bd191973a9fd3357de..a02e25f04e54f694212fb0ee1918cdd5565ee521 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -18,6 +18,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
@@ -27,7 +28,6 @@
 
 #include <haproxy/arg-t.h>
 
-#include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 #include <proto/stream.h>

diff --git a/src/trace.c b/src/trace.c
index bb9db085ac9bdd68c398e3e5a24381febd1e860b..997a994fd4df9e21f68c1d8b57c32ec40733a375 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -24,7 +24,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/list.h>
-#include <proto/log.h>
+#include <haproxy/log.h>
 #include <haproxy/sink.h>
 #include <haproxy/trace.h>
 

diff --git a/src/uri_auth.c b/src/uri_auth.c
index 2005bc8124a6089194f1ccfe08f5f57cac26bdb3..248431cd7b9a2b4a821b9c033c6cda36e93544eb 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -15,10 +15,10 @@
 
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
+#include <haproxy/log.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/uri_auth.h>
 
-#include <proto/log.h>
 
 /*
  * Initializes a basic uri_auth structure header and returns a pointer to it.

diff --git a/src/wdt.c b/src/wdt.c
index 3485c8f5ac772c809bf0e97fdd12f802228d7586..c17d67c3cf4da263e502e047a6135a7ef832addb 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -15,9 +15,9 @@
 #include <haproxy/api.h>
 #include <haproxy/debug.h>
 #include <haproxy/global.h>
+#include <haproxy/log.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <proto/log.h>
 
 
 /*

diff --git a/src/wurfl.c b/src/wurfl.c
index f7992e53c80edcfba8272065c62b92294b9ddd90..57e794e16c8113fbf5360f0188eb1c2cff0ca541 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -10,8 +10,8 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/log.h>
 #include <haproxy/arg.h>
-#include <proto/log.h>
 #include <haproxy/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>