From b9cda4602b26a4778fdfec4990a62b6faf2bc86b Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 17 Nov 2017 17:42:03 +0100
Subject: [PATCH] omkafka bufgix: various config parameters did not work

These are not even recognized when used and leads to a config startup error message:
* closeTimeout
* reopenOnHup
* resubmitOnFailure
* keepFailedMessages
* failedMsgFile

Reason was invalid use of upper case in config param block.

fixes https://github.com/rsyslog/rsyslog/issues/2052
---
 plugins/omkafka/omkafka.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/omkafka/omkafka.c b/plugins/omkafka/omkafka.c
index 755a65f1c..da4308259 100644
--- a/plugins/omkafka/omkafka.c
+++ b/plugins/omkafka/omkafka.c
@@ -180,11 +180,11 @@ static struct cnfparamdescr actpdescr[] = {
 	{ "errorfile", eCmdHdlrGetWord, 0 },
 	{ "key", eCmdHdlrGetWord, 0 },
 	{ "template", eCmdHdlrGetWord, 0 },
-	{ "closeTimeout", eCmdHdlrPositiveInt, 0 },
-	{ "reopenOnHup", eCmdHdlrBinary, 0 },
-	{ "resubmitOnFailure", eCmdHdlrBinary, 0 },	/* Resubmit message into kafaj queue on failure */
-	{ "keepFailedMessages", eCmdHdlrBinary, 0 },
-	{ "failedMsgFile", eCmdHdlrGetWord, 0 }
+	{ "closetimeout", eCmdHdlrPositiveInt, 0 },
+	{ "reopenonhup", eCmdHdlrBinary, 0 },
+	{ "resubmitonfailure", eCmdHdlrBinary, 0 },	/* Resubmit message into kafaj queue on failure */
+	{ "keepfailedmessages", eCmdHdlrBinary, 0 },
+	{ "failedmsgfile", eCmdHdlrGetWord, 0 }
 };
 static struct cnfparamblk actpblk =
 	{ CNFPARAMBLK_VERSION,
@@ -1395,7 +1395,7 @@ CODESTARTnewActInst
 			pData->dynaTopic = pvals[i].val.d.n;
 		} else if(!strcmp(actpblk.descr[i].name, "dynatopic.cachesize")) {
 			pData->iDynaTopicCacheSize = pvals[i].val.d.n;
-		} else if(!strcmp(actpblk.descr[i].name, "closeTimeout")) {
+		} else if(!strcmp(actpblk.descr[i].name, "closetimeout")) {
 			pData->closeTimeout = pvals[i].val.d.n;
 		} else if(!strcmp(actpblk.descr[i].name, "partitions.auto")) {
 			pData->autoPartition = pvals[i].val.d.n;
@@ -1442,13 +1442,13 @@ CODESTARTnewActInst
 			pData->key = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
 		} else if(!strcmp(actpblk.descr[i].name, "template")) {
 			pData->tplName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-		} else if(!strcmp(actpblk.descr[i].name, "reopenOnHup")) {
+		} else if(!strcmp(actpblk.descr[i].name, "reopenonhup")) {
 			pData->bReopenOnHup = pvals[i].val.d.n;
-		} else if(!strcmp(actpblk.descr[i].name, "resubmitOnFailure")) {
+		} else if(!strcmp(actpblk.descr[i].name, "resubmitonfailure")) {
 			pData->bResubmitOnFailure = pvals[i].val.d.n;
-		} else if(!strcmp(actpblk.descr[i].name, "keepFailedMessages")) {
+		} else if(!strcmp(actpblk.descr[i].name, "keepfailedmessages")) {
 			pData->bKeepFailedMessages = pvals[i].val.d.n;
-		} else if(!strcmp(actpblk.descr[i].name, "failedMsgFile")) {
+		} else if(!strcmp(actpblk.descr[i].name, "failedmsgfile")) {
 			pData->failedMsgFile = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
 		} else {
 			dbgprintf("omkafka: program error, non-handled param '%s'\n", actpblk.descr[i].name);