bugfix: $myhostname not available in RainerScript (and no error message)

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

4 files changed, 25 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 3300c730..f558301d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------
+Version 5.8.1  [V5-stable] (rgerhards), 2011-04-??
+- bugfix: $myhostname not available in RainerScript (and no error message)
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233
+---------------------------------------------------------------------------
 Version 5.8.0  [V5-stable] (rgerhards), 2011-04-12
 
 This is the new v5-stable branch, importing all feature from the 5.7.x
diff --git a/runtime/rule.c b/runtime/rule.c
index 42773768..d5f18e71 100644
--- a/runtime/rule.c
+++ b/runtime/rule.c
@@ -173,7 +173,7 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, sbool *bProcessMsg)
 
 	if(pRule->f_filter_type == FILTER_PRI) {
 		/* skip messages that are incorrect priority */
-dbgprintf("testing filter, f_pmask %d\n", pRule->f_filterData.f_pmask[pMsg->iFacility]);
+		dbgprintf("testing filter, f_pmask %d\n", pRule->f_filterData.f_pmask[pMsg->iFacility]);
 		if ( (pRule->f_filterData.f_pmask[pMsg->iFacility] == TABLE_NOPRI) || \
 		    ((pRule->f_filterData.f_pmask[pMsg->iFacility] & (1<<pMsg->iSeverity)) == 0) )
 			bRet = 0;
@@ -185,7 +185,7 @@ dbgprintf("testing filter, f_pmask %d\n", pRule->f_filterData.f_pmask[pMsg->iFac
 		CHKiRet(vm.SetMsg(pVM, pMsg));
 		CHKiRet(vm.ExecProg(pVM, pRule->f_filterData.f_expr->pVmprg));
 		CHKiRet(vm.PopBoolFromStack(pVM, &pResult));
-		dbgprintf("result of expression evaluation: %lld\n", pResult->val.num);
+		dbgprintf("result of rainerscript filter evaluation: %lld\n", pResult->val.num);
 		/* VM is destructed on function exit */
 		bRet = (pResult->val.num) ? 1 : 0;
 	} else {
diff --git a/runtime/sysvar.c b/runtime/sysvar.c
index 4a6ace19..ecc31e2d 100644
--- a/runtime/sysvar.c
+++ b/runtime/sysvar.c
@@ -41,6 +41,7 @@
 DEFobjStaticHelpers
 DEFobjCurrIf(var)
 DEFobjCurrIf(datetime)
+DEFobjCurrIf(glbl)
 
 
 /* Standard-Constructor
@@ -146,6 +147,8 @@ GetVar(cstr_t *pstrVarName, var_t **ppVar)
 		CHKiRet(getNOW(NOW_HOUR, &pstrProp));
 	} else if(!rsCStrSzStrCmp(pstrVarName, (uchar*)"minute", sizeof("minute") - 1)) {
 		CHKiRet(getNOW(NOW_MINUTE, &pstrProp));
+	} else if(!rsCStrSzStrCmp(pstrVarName, (uchar*)"myhostname", sizeof("myhostname") - 1)) {
+		CHKiRet(rsCStrConstructFromszStr(&pstrProp, glbl.GetLocalHostName()));
 	} else {
 		ABORT_FINALIZE(RS_RET_SYSVAR_NOT_FOUND);
 	}
@@ -191,6 +194,7 @@ BEGINObjClassInit(sysvar, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(var, CORE_COMPONENT));
 	CHKiRet(objUse(datetime, CORE_COMPONENT));
+	CHKiRet(objUse(glbl, CORE_COMPONENT));
 
 	/* set our own handlers */
 	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, sysvarConstructFinalize);
diff --git a/runtime/vm.c b/runtime/vm.c
index 0ed174d1..84ba4bcf 100644
--- a/runtime/vm.c
+++ b/runtime/vm.c
@@ -288,7 +288,7 @@ BEGINCMPOP(CMP_NEQ) /* remember to change the name also in the END macro! */
 	case VARTYPE_STR:
 		bRes = rsCStrCStrCmp(operand1->val.pStr, operand2->val.pStr);
 		break;
-ENDCMPOP(CMP_EQ)
+ENDCMPOP(CMP_NEQ)
 
 BEGINCMPOP(CMP_LT) /* remember to change the name also in the END macro! */
 	case VARTYPE_NUMBER:
@@ -474,6 +474,15 @@ CODESTARTop(PUSHSYSVAR)
 	CHKiRet(sysvar.GetVar(pOp->operand.pVar->val.pStr, &pVal));
 	vmstk.Push(pThis->pStk, pVal);
 finalize_it:
+	if(Debug && iRet != RS_RET_OK) {
+		if(iRet == RS_RET_SYSVAR_NOT_FOUND) {
+			DBGPRINTF("rainerscript: sysvar '%s' not found\n",
+				  rsCStrGetSzStrNoNULL(pOp->operand.pVar->val.pStr));
+		} else {
+			DBGPRINTF("rainerscript: error %d trying to obtain sysvar '%s'\n",
+				  iRet, rsCStrGetSzStrNoNULL(pOp->operand.pVar->val.pStr));
+		}
+	}
 ENDop(PUSHSYSVAR)
 
 /* The function call operation is only very roughly implemented. While the plumbing
@@ -666,9 +675,11 @@ execProg(vm_t *pThis, vmprg_t *pProg)
 	ISOBJ_TYPE_assert(pThis, vm);
 	ISOBJ_TYPE_assert(pProg, vmprg);
 
-#define doOP(OP) case opcode_##OP: CHKiRet(op##OP(pThis, pCurrOp)); break
+#define doOP(OP) case opcode_##OP: DBGPRINTF("rainerscript: opcode %s\n", #OP); \
+				   CHKiRet(op##OP(pThis, pCurrOp)); break
 	pCurrOp = pProg->vmopRoot; /* TODO: do this via a method! */
 	while(pCurrOp != NULL && pCurrOp->opcode != opcode_END_PROG) {
+		DBGPRINTF("rainerscript: executing step, opcode %d...\n", pCurrOp->opcode);
 		switch(pCurrOp->opcode) {
 			doOP(OR);
 			doOP(AND);
@@ -695,8 +706,8 @@ execProg(vm_t *pThis, vmprg_t *pProg)
 			doOP(UNARY_MINUS);
 			doOP(FUNC_CALL);
 			default:
-				ABORT_FINALIZE(RS_RET_INVALID_VMOP);
 				dbgoprint((obj_t*) pThis, "invalid instruction %d in vmprg\n", pCurrOp->opcode);
+				ABORT_FINALIZE(RS_RET_INVALID_VMOP);
 				break;
 		}
 		/* so far, we have plain sequential execution, so on to next... */
@@ -709,6 +720,7 @@ execProg(vm_t *pThis, vmprg_t *pProg)
 	 */
 
 finalize_it:
+	DBGPRINTF("rainerscript: script execution terminated with state %d\n", iRet);
 	RETiRet;
 }