diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
| commit | 90ef0f7a0b3cd025e30611cd30d72beaf86ff18b (patch) | |
| tree | fcd439784db76a2c39fc7ce43c53cfc5c02639fd /runtime/sysvar.c | |
| parent | 57722664bcdfcd7be425ad3db02a884ff8c17f47 (diff) | |
| parent | 72c235744023d10e1a9b44c90b65a6b34029e471 (diff) | |
| download | rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.gz rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.bz2 rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.zip | |
Merge branch 'v5-devel'
Conflicts:
plugins/impstats/impstats.c
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); |