bugfix(kind of): tell users that config graph can currently not be generated

closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232

4 files changed, 22 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1622a0bc..a8ac416d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------
+Version 5.6.5  [V5-STABLE] (rgerhards), 2011-03-??
+- bugfix(kind of): tell users that config graph can currently not be
+  generated
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
+- bugfix: discard action did not work under some circumstances
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
+  (backport from 5.7.8)
+---------------------------------------------------------------------------
 Version 5.6.4  [V5-STABLE] (rgerhards), 2011-03-03
 - bugfix: potential abort condition when $RepeatedMsgReduction set to on
   as well as potentially in a number of other places where MsgDup() was
diff --git a/action.c b/action.c
index 4bf8ba04..d41449d0 100644
--- a/action.c
+++ b/action.c
@@ -1480,7 +1480,8 @@ helperSubmitToActionQComplexBatch(action_t *pAction, batch_t *pBatch)
 
 	DBGPRINTF("Called action(complex case), logging to %s\n", module.GetStateName(pAction->pMod));
 	for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) {
-		if(pBatch->pElem[i].bFilterOK) {
+		if(   pBatch->pElem[i].bFilterOK
+                   && pBatch->pElem[i].state != BATCH_STATE_DISC) {
 			doActionCallAction(pAction, (msg_t*)(pBatch->pElem[i].pUsrp));
 		}
 	}
diff --git a/doc/rsconf1_generateconfiggraph.html b/doc/rsconf1_generateconfiggraph.html
index 0b18463a..3f0fd666 100644
--- a/doc/rsconf1_generateconfiggraph.html
+++ b/doc/rsconf1_generateconfiggraph.html
@@ -8,8 +8,14 @@
 <h2>$GenerateConfigGraph</h2>
 <p><b>Type:</b> global configuration directive</p>
 <p><b>Default:</b> </p>
-<p><b>Available Since:</b> 4.3.1</p>
+<p><b>Available Since:</b> 4.3.1 <b>CURRENTLY NOT AVAILABLE</b></p>
 <p><b>Description:</b></p>
+<b>This directive is currently not supported. We had to disable it when we improved the
+rule engine. It is considerable effort to re-enable it. On the other hand, we are about
+to add a new config system, which will make yet another config graph method necessary.
+As such we have decided to currently disable this functionality and re-introduce it when
+the new config system has been instantiated.
+</b></p>
 <p>This directive permits to create (hopefully) good-looking visualizations of rsyslogd's
 configuration. It does not affect rsyslog operation. If the directive is specified multiple
 times, all but the last are ignored. If it is specified, a graph is created. This happens
diff --git a/tools/syslogd.c b/tools/syslogd.c
index ffcaa27f..dd9729ef 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1334,6 +1334,11 @@ generateConfigDAG(uchar *pszDAGFile)
 
 	assert(pszDAGFile != NULL);
 	
+	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)
+		"Configuration graph generation is unfortunately disabled "
+		"in the current code base.", 0);
+	ABORT_FINALIZE(RS_RET_FILENAME_INVALID);
+
 	if((fp = fopen((char*) pszDAGFile, "w")) == NULL) {
 		logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)
 			"configuraton graph output file could not be opened, none generated", 0);