rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 18:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v7-stable' into v8-stable

Browse Source
This commit is contained in:
Rainer Gerhards 2014-05-05 12:33:56 +02:00
commit e180d359c9
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -901,11 +901,9 @@ AC_ARG_ENABLE(mail,
AM_CONDITIONAL(ENABLE_MAIL, test x$enable_mail = xyes)
# imdiag support (so far we do not need a library, but we need to turn this on and off)
# note that we enable this be default, because an important point is to make
# it available to users who do not know much about how to handle things. It
# would complicate things if we first needed to tell them how to enable imdiag.
# rgerhards, 2008-07-25
# imdiag support
# This is a core testbench tool. You need to enable it if you want to
# use not only a small subset of the testbench.
AC_ARG_ENABLE(imdiag,
[AS_HELP_STRING([--enable-imdiag],[Enable imdiag @<:@default=no@:>@])],
[case "${enableval}" in

10
plugins/imdiag/imdiag.c
View File

@ -1,13 +1,11 @@
/* imdiag.c
* This is a diagnostics module, primarily meant for troubleshooting
* and information about the runtime state of rsyslog. It is implemented
* as an input plugin, because that interface best suits our needs
* and also enables us to inject test messages (something not yet
* implemented).
* This is a testbench tool. It started out with a broader scope,
* but we dropped this idea. To learn about rsyslog runtime statistics
* have a look at impstats.
*
* File begun on 2008-07-25 by RGerhards
*
* Copyright 2008-2012 Adiscon GmbH.
* Copyright 2008-2014 Adiscon GmbH.
*
* This file is part of rsyslog.
*