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

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 43bbbf98bf1e654f7dc235f666f94ae069198a24..e939df3ed013a2a56f564f155b445adb7e4bb202 100644 (file)
--- 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 9b7c6d52b0925395aed7fedcaaa8a5dbbb048c20..30179d803ed1021475ff83b7fcfb3d2bf65ebff0 100644 (file)
--- 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 e30c3d3e0c1a112e2fa2b010597c00c30cdf5430..cfb0afccb7a516be13cb18e89d403504053792b8 100644 (file)
--- 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 c2507163fbd23984268bbc4e88f7f64827b845dc..61a9800f743bf070f15df95b3515c290c6720f2a 100644 (file)
--- 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 b9723d8c15ae7ed97978594662b1b96f65ba883f..10bc4160fe223b5281d029499c470968df5b8077 100644 (file)
--- 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 21d41e8bd3b1d71b69b57316c53cb91471cdba8a..076c44269e3e55a8611e522bcea4d9d21e6c1c81 100644 (file)
--- 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 ae7ed50605f0ece7965046adaad3aaff1c6db5d8..72eb3bd0891d2c26cf4d6d4bc8e22c23dd06f935 100644 (file)
--- 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 da23908e7cf221299bd77c434113c813409c1279..afb6e4a03970e8faf6c4836352564d2ea1ce86fb 100644 (file)
--- 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 a54d66a2b0b9b24c6c971b755a0670ae96c9c702..f6133de8e96d7350d350c74ad7ade6fc916ed8f7 100644 (file)
--- 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 288142cd11913feb6f2b671a600e451d200fe80a..87b276521bfcc49d581d56d7632f3d736e6fc52b 100644 (file)
--- 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 f93c22f4db2d728c1cbf731ff852b27c53501a29..f795824b1dfe88994d590241adf25d19acf58893 100644 (file)
--- 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 0e1db3746505df8d2c49e5622fb7084e907cc93b..964638ea6132e89896b78ace2491fe99f2dbe94b 100644 (file)
--- 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 0a385d81969e45045ae9c39d802432db340b1df6..6c500b466096444e683608292c8169b0adc0246e 100644 (file)
--- 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 716515fe6381f1dfc5e3209dd5a8e750c49addd6..d418749093335737cde3921e49ff5e90ce5516e5 100644 (file)
--- 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 4065a535a0dd1c6fc38e8e17dba5552ec4697f59..3a91ec5a3ed3c616db11bc659eeaefff38011137 100644 (file)
--- 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 b4b0bfdda01b6e8de5047015411ab7fcbfbe8a29..b205b60b039a8d03f3607c19b10af3f013979da3 100644 (file)
--- 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 4a5542a9a12eb012d8dd8b1c48f748cf63a1380a..5218ccb81c36de09548937d7e4690368b59016fd 100644 (file)
--- 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 1cc5521cc361b92bd704c0473675c77f6913f5b2..1b2633afe016966532961082c4b3ad1f300d78e6 100644 (file)
--- 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 15bea7c513718754148c1328bfbcd068886acdae..eba2cebd68e448764d5cc837eea20eb501ca1f48 100644 (file)
--- 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 cd88f1e580079d8f5c6f563d922692639ce94294..cdf03b283924c047feb170016ef89463d1fbcebe 100644 (file)
--- 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 bcc47840530f8f7936a599dd89a8cd8db2e03949..b3e6f7b033b31ee3a2e28b80bc924c36afd3addf 100644 (file)
--- 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;
     }