From: maxtors <moe.andreas@gmail.com>
Date: Sun, 24 Apr 2016 09:04:59 +0000 (+0200)
Subject: Corrected and unified debugmessages for init data errors in *ThreadInit.
X-Git-Tag: suricata-3.1RC1~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69863f7b1c34fadf6148066dbc099e17812cabee;p=thirdparty%2Fsuricata.git

Corrected and unified debugmessages for init data errors in *ThreadInit.
---

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 43bbbf98bf..e939df3ed0 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -401,7 +401,7 @@ static TmEcode AlertDebugLogThreadInit(ThreadVars *t, void *initdata, void **dat
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for DebugLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for AlertDebugLog.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 9b7c6d52b0..30179d803e 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -1176,7 +1176,7 @@ TmEcode Unified2AlertThreadInit(ThreadVars *t, void *initdata, void **data)
     memset(aun, 0, sizeof(Unified2AlertThread));
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for Unified2Alert.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for AlertUnified2.  \"initdata\" argument NULL");
         SCFree(aun);
         return TM_ECODE_FAILED;
     }
diff --git a/src/log-dnslog.c b/src/log-dnslog.c
index e30c3d3e0c..cfb0afccb7 100644
--- a/src/log-dnslog.c
+++ b/src/log-dnslog.c
@@ -248,7 +248,7 @@ static TmEcode LogDnsLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for DNSLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogDNSLog.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/log-filestore.c b/src/log-filestore.c
index c2507163fb..61a9800f74 100644
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -351,7 +351,7 @@ static TmEcode LogFilestoreLogThreadInit(ThreadVars *t, void *initdata, void **d
 
     if (initdata == NULL)
     {
-        SCLogDebug("Error getting context for LogFilestore. \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogFileStore. \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/log-httplog.c b/src/log-httplog.c
index b9723d8c15..10bc4160fe 100644
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -542,7 +542,7 @@ TmEcode LogHttpLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogHTTPLog.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/log-pcap.c b/src/log-pcap.c
index 21d41e8bd3..076c44269e 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -471,7 +471,7 @@ static PcapLogData *PcapLogDataCopy(const PcapLogData *pl)
 static TmEcode PcapLogDataInit(ThreadVars *t, void *initdata, void **data)
 {
     if (initdata == NULL) {
-        SCLogDebug("Error getting context for PcapLog. \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogPcap. \"initdata\" argument NULL");
         return TM_ECODE_FAILED;
     }
 
diff --git a/src/log-stats.c b/src/log-stats.c
index ae7ed50605..72eb3bd089 100644
--- a/src/log-stats.c
+++ b/src/log-stats.c
@@ -172,7 +172,7 @@ TmEcode LogStatsLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogStats.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/log-tlsstore.c b/src/log-tlsstore.c
index da23908e7c..afb6e4a039 100644
--- a/src/log-tlsstore.c
+++ b/src/log-tlsstore.c
@@ -316,7 +316,7 @@ static TmEcode LogTlsStoreLogThreadInit(ThreadVars *t, void *initdata, void **da
     memset(aft, 0, sizeof(LogTlsStoreLogThread));
 
     if (initdata == NULL) {
-        SCLogDebug("Error getting context for LogTlsStore. \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for LogTLSStore. \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index a54d66a2b0..f6133de8e9 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -470,7 +470,7 @@ static TmEcode JsonAlertLogThreadInit(ThreadVars *t, void *initdata, void **data
     memset(aft, 0, sizeof(JsonAlertLogThread));
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for AlertFastLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogAlert.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index 288142cd11..87b276521b 100644
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -286,7 +286,7 @@ static TmEcode LogDnsLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for DNSLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogDNS.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index f93c22f4db..f795824b1d 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -184,7 +184,7 @@ static TmEcode JsonDropLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for AlertFastLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogDrop.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-file.c b/src/output-json-file.c
index 0e1db37465..964638ea61 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -197,7 +197,7 @@ static TmEcode JsonFileLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogFile.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 0a385d8196..6c500b4660 100644
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -415,7 +415,7 @@ static TmEcode JsonFlowLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogFlow.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-http.c b/src/output-json-http.c
index 716515fe63..d418749093 100644
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -549,7 +549,7 @@ static TmEcode JsonHttpLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogHTTP.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 4065a535a0..3a91ec5a3e 100644
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -397,7 +397,7 @@ static TmEcode JsonNetFlowLogThreadInit(ThreadVars *t, void *initdata, void **da
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogNetflow.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index b4b0bfdda0..b205b60b03 100644
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -224,7 +224,7 @@ static TmEcode JsonSmtpLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for SMTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogSMTP.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index 4a5542a9a1..5218ccb81c 100644
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -150,7 +150,7 @@ static TmEcode JsonSshLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogSSH.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-stats.c b/src/output-json-stats.c
index 1cc5521cc3..1b2633afe0 100644
--- a/src/output-json-stats.c
+++ b/src/output-json-stats.c
@@ -216,7 +216,7 @@ static TmEcode JsonStatsLogThreadInit(ThreadVars *t, void *initdata, void **data
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for json stats.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogStats.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-template.c b/src/output-json-template.c
index 15bea7c513..eba2cebd68 100644
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -146,7 +146,7 @@ static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, void *initdata, void **d
     }
 
     if (initdata == NULL) {
-        SCLogDebug("Error getting context for Template.  \"initdata\" is NULL.");
+        SCLogDebug("Error getting context for EveLogTemplate.  \"initdata\" is NULL.");
         SCFree(thread);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index cd88f1e580..cdf03b2839 100644
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -190,7 +190,7 @@ static TmEcode JsonTlsLogThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLogTLS.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }
diff --git a/src/output-json.c b/src/output-json.c
index bcc4784053..b3e6f7b033 100644
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -20,7 +20,7 @@
  *
  * \author Tom DeCanio <td@npulsetech.com>
  *
- * Logs alerts in JSON format.
+ * Logs detection and monitoring events in JSON format.
  *
  */
 
@@ -383,7 +383,7 @@ TmEcode OutputJsonThreadInit(ThreadVars *t, void *initdata, void **data)
 
     if(initdata == NULL)
     {
-        SCLogDebug("Error getting context for AlertJson.  \"initdata\" argument NULL");
+        SCLogDebug("Error getting context for EveLog.  \"initdata\" argument NULL");
         SCFree(aft);
         return TM_ECODE_FAILED;
     }