diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
| commit | 72c235744023d10e1a9b44c90b65a6b34029e471 (patch) | |
| tree | d6e14606cc430beeead93d68fc46de7ed82915c1 /runtime/sysvar.c | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| parent | 254dc643c260c0f4a489188b2277811a4104063e (diff) | |
| download | rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.gz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.bz2 rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/sysvar.c')
| -rw-r--r-- | runtime/sysvar.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |