diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
| commit | d6da57ae0370aeb705f63fd04e575b5ed4684618 (patch) | |
| tree | d451907714559f5df60eb0cdef6ccbc205c812e4 /plugins/impstats | |
| parent | d8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.xz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip | |
Merge branch 'v5-stable-newstats'
Conflicts:
action.c
configure.ac
doc/imuxsock.html
plugins/imklog/imklog.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
runtime/ruleset.c
tcpsrv.h
tools/syslogd.c
Diffstat (limited to 'plugins/impstats')
| -rw-r--r-- | plugins/impstats/impstats.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index dfca25da..4fec8e70 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -75,7 +75,6 @@ static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current lo static configSettings_t cs; static prop_t *pInputName = NULL; -static prop_t *pLocalHostIP = NULL; BEGINisCompatibleWithFeature CODESTARTisCompatibleWithFeature @@ -106,7 +105,7 @@ doSubmitMsg(uchar *line) MsgSetRawMsgWOSize(pMsg, (char*)line); MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName())); MsgSetRcvFrom(pMsg, glbl.GetLocalHostNameProp()); - MsgSetRcvFromIP(pMsg, pLocalHostIP); + MsgSetRcvFromIP(pMsg, glbl.GetLocalHostIP()); MsgSetMSGoffs(pMsg, 0); MsgSetTAG(pMsg, UCHAR_CONSTANT("rsyslogd-pstats:"), sizeof("rsyslogd-pstats:") - 1); pMsg->iFacility = runModConf->iFacility; @@ -221,7 +220,6 @@ ENDafterRun BEGINmodExit CODESTARTmodExit prop.Destruct(&pInputName); - prop.Destruct(&pLocalHostIP); /* release objects we used */ objRelease(glbl, CORE_COMPONENT); objRelease(prop, CORE_COMPONENT); @@ -266,10 +264,6 @@ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(prop.Construct(&pInputName)); CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("impstats"), sizeof("impstats") - 1)); CHKiRet(prop.ConstructFinalize(pInputName)); - - CHKiRet(prop.Construct(&pLocalHostIP)); - CHKiRet(prop.SetString(pLocalHostIP, UCHAR_CONSTANT("127.0.0.1"), sizeof("127.0.0.1") - 1)); - CHKiRet(prop.ConstructFinalize(pLocalHostIP)); ENDmodInit /* vi:set ai: */ |