diff --git a/src/cfgparse.c b/src/cfgparse.c
index d491560..fc346b9 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1418,14 +1418,8 @@
 		else
 			logsrv->maxlen = MAX_SYSLOG_LEN;
 
-		if (logsrv->maxlen > global.max_syslog_len) {
+		if (logsrv->maxlen > global.max_syslog_len)
 			global.max_syslog_len = logsrv->maxlen;
-			if (!init_log_buffers()) {
-				Alert("parsing [%s:%d] : failed to initialize log buffers.\n", file, linenum);
-				err_code |= ERR_ALERT | ERR_FATAL;
-				goto out;
-			}
-		}
 
 		/* after the length, a format may be specified */
 		if (strcmp(args[arg+2], "format") == 0) {
@@ -6081,14 +6075,8 @@
 			else
 				logsrv->maxlen = MAX_SYSLOG_LEN;
 
-			if (logsrv->maxlen > global.max_syslog_len) {
+			if (logsrv->maxlen > global.max_syslog_len)
 				global.max_syslog_len = logsrv->maxlen;
-				if (!init_log_buffers()) {
-					Alert("parsing [%s:%d] : failed to initialize log buffers.\n", file, linenum);
-					err_code |= ERR_ALERT | ERR_FATAL;
-					goto out;
-				}
-			}
 
 			/* after the length, a format may be specified */
 			if (strcmp(args[arg+2], "format") == 0) {
diff --git a/src/haproxy.c b/src/haproxy.c
index 7c925ea..47ef859 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1718,6 +1718,11 @@
 		exit(1);
 	}
 
+	if (!init_log_buffers()) {
+		Alert("failed to initialize log buffers.\n");
+		exit(1);
+	}
+
 	swap_buffer = calloc(1, global.tune.bufsize);
 	get_http_auth_buff = calloc(1, global.tune.bufsize);
 	static_table_key = calloc(1, sizeof(*static_table_key));
