Cgrulesengd is using different default logging level than the library. Currently
it's set to WARNING, which is not consistend with the rest of the library. This
patch sets the default logging level to ERROR.
Signed-off-by: Peter Schiffer <pschi...@redhat.com>
---
doc/man/cgrulesengd.8 | 9 ++++-----
src/daemon/cgrulesengd.c | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/doc/man/cgrulesengd.8 b/doc/man/cgrulesengd.8
index 9566c23..2e89c5b 100644
--- a/doc/man/cgrulesengd.8
+++ b/doc/man/cgrulesengd.8
@@ -38,18 +38,17 @@ and '\fB-s\fR' are used together, the logs are sent to both
destinations.
Don't fork the daemon, stay in the foreground.
.TP
.B -v|--verbose
-Display more log messages. This option can be used twice to enable more
verbose log
-messages.
+Display more log messages. This option can be used three times to enable more
+verbose log messages.
.TP
.B -q|--quiet
-Display less log messages. This option can be used twice to enable even less
log
-messages and to only log errors.
+Display less log messages.
.TP
.B -Q|--nolog
Disable logging.
.TP
.B -d|--debug
-Equivalent to '-nvvf -', i.e. don't fork the daemon, display all log messages
and
+Equivalent to '-nvvvf -', i.e. don't fork the daemon, display all log messages
and
write them to the standard output.
.TP
.B -u <user>|--socket-user=<user>
diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 270caaf..9dd039a 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -795,7 +795,7 @@ close_and_exit:
* Start logging. Opens syslog and/or log file and sets log level.
* @param logp Path of the log file, NULL if no log file was specified
* @param logf Syslog facility, NULL if no facility was specified
- * @param logv Log verbosity, 2 is the default, 0 = no logging, 4 =
everything
+ * @param logv Log verbosity, 1 is the default, 0 = no logging, 4 =
everything
*/
static void cgre_start_log(const char *logp, int logf, int logv)
{
@@ -862,7 +862,7 @@ static void cgre_start_log(const char *logp, int logf, int
logv)
* @param logp Path of the log file, NULL if no log file was specified
* @param logf Syslog facility, 0 if no facility was specified
* @param daemon False to turn off daemon mode (no fork, leave FDs open)
- * @param logv Log verbosity, 2 is the default, 0 = no logging, 5 =
everything
+ * @param logv Log verbosity, 1 is the default, 0 = no logging, 5 =
everything
* @return 0 on success, > 0 on error
*/
int cgre_start_daemon(const char *logp, const int logf,
@@ -1039,7 +1039,7 @@ int main(int argc, char *argv[])
int facility = 0;
/* Verbose level */
- int verbosity = 2;
+ int verbosity = 1;
/* For catching signals */
struct sigaction sa;
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
