From 3fab684f974e6f13c3bf217029501e2cd1e4fe67 Mon Sep 17 00:00:00 2001
From: Jason Ish <ish@unx.ca>
Date: Thu, 6 Oct 2016 09:59:13 -0600
Subject: [PATCH] logging: don't log that json is disabled in each logger

A warning log is already emitted if eve-log is enabled in the
configuration but json support is not built so the logger
registration functions can be silent.
---
 src/output-json-alert.c    | 1 -
 src/output-json-dns.c      | 1 -
 src/output-json-drop.c     | 1 -
 src/output-json-file.c     | 1 -
 src/output-json-flow.c     | 1 -
 src/output-json-http.c     | 1 -
 src/output-json-netflow.c  | 1 -
 src/output-json-smtp.c     | 1 -
 src/output-json-ssh.c      | 1 -
 src/output-json-stats.c    | 1 -
 src/output-json-template.c | 2 --
 src/output-json-tls.c      | 1 -
 12 files changed, 13 deletions(-)

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 6823774487..1db766d61f 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -740,7 +740,6 @@ void JsonAlertLogRegister (void)
 
 void JsonAlertLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index f55d6d5461..948cce7def 100644
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -878,7 +878,6 @@ void JsonDnsLogRegister (void)
 
 void JsonDnsLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 66ab32aea9..e26fd6dcb6 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -438,7 +438,6 @@ void JsonDropLogRegister (void)
 
 void JsonDropLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-file.c b/src/output-json-file.c
index 4fb08b5ea1..29b3d0e5d1 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -310,7 +310,6 @@ void JsonFileLogRegister (void)
 
 void JsonFileLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 26723fdf02..09b15c09e1 100644
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -483,7 +483,6 @@ void JsonFlowLogRegister (void)
 
 void JsonFlowLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-http.c b/src/output-json-http.c
index 381ddeb4c4..a220252780 100644
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -599,7 +599,6 @@ void JsonHttpLogRegister (void)
 
 void JsonHttpLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index fb39d219e4..4733a7dcb7 100644
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -447,7 +447,6 @@ void JsonNetFlowLogRegister(void)
 
 void JsonNetFlowLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index 368e917c28..6bec700e16 100644
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -273,7 +273,6 @@ void JsonSmtpLogRegister (void) {
 
 void JsonSmtpLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index 2b0ac7f99c..627b2b6f59 100644
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -326,7 +326,6 @@ void JsonSshLogRegister (void)
 
 void JsonSshLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-stats.c b/src/output-json-stats.c
index be1646a445..16bf629c91 100644
--- a/src/output-json-stats.c
+++ b/src/output-json-stats.c
@@ -387,7 +387,6 @@ void JsonStatsLogRegister(void) {
 
 void JsonStatsLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/output-json-template.c b/src/output-json-template.c
index 88e8ee7981..fcbee919b9 100644
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -210,8 +210,6 @@ void JsonTemplateLogRegister(void)
 
 void JsonTemplateLogRegister(void)
 {
-    SCLogInfo("Cannot register JSON output for template. "
-        "JSON support was disabled during build.");
 }
 
 #endif /* HAVE_LIBJANSSON */
diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index f1accdde32..0f75547c9c 100644
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -347,7 +347,6 @@ void JsonTlsLogRegister (void)
 
 void JsonTlsLogRegister (void)
 {
-    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif