From a6223ca120c0afcbe5560fc879df66c533555b0a Mon Sep 17 00:00:00 2001 From: Tomas Plesnik <plesnik@ics.muni.cz> Date: Thu, 19 Mar 2015 14:41:20 +0100 Subject: [PATCH] pridani parametru pro nastaveni verbosity logovani do syslogu; zmena nazvu parametru pro nastaveni verbosity na stderr --- src/warden-client/etc/warden-client.conf | 13 ++++++++++--- src/warden-client/etc/warden-client.conf.tmpl | 13 ++++++++++--- .../etc/warden-client.conf.tmpl.update | 13 ++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/warden-client/etc/warden-client.conf b/src/warden-client/etc/warden-client.conf index fb571e3..c274a42 100644 --- a/src/warden-client/etc/warden-client.conf +++ b/src/warden-client/etc/warden-client.conf @@ -31,7 +31,7 @@ $SSL_CA_CERT = "/etc/ssl/certs/tcs-ca-bundle.pem"; # consumes app. 250 MB of memory #------------------------------------------------------------------------------- $MAX_RCV_EVENTS_LIMIT = 6000; - + #------------------------------------------------------------------------------- # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden # server. If your client timeouts, consider using higher @@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = 60; $LOG_STDERR = 1; #------------------------------------------------------------------------------- -# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added) +# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack +# info added) if reporting to stderr is enabled only #------------------------------------------------------------------------------- -$LOG_VERBOSE = 1; +$LOG_STDERR_VERBOSE = 0; #------------------------------------------------------------------------------- # SYSLOG - enable/disable syslog logging #------------------------------------------------------------------------------- $SYSLOG = 1; +#------------------------------------------------------------------------------- +# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info +# added) if syslog logging is enabled only +#------------------------------------------------------------------------------- +$SYSLOG_VERBOSE = 0; + #------------------------------------------------------------------------------- # SYSLOG_FACILITY - syslog facility #------------------------------------------------------------------------------- diff --git a/src/warden-client/etc/warden-client.conf.tmpl b/src/warden-client/etc/warden-client.conf.tmpl index f31fe2a..d9d79eb 100644 --- a/src/warden-client/etc/warden-client.conf.tmpl +++ b/src/warden-client/etc/warden-client.conf.tmpl @@ -31,7 +31,7 @@ $SSL_CA_CERT = "_CAFILE_"; # consumes app. 250 MB of memory #------------------------------------------------------------------------------- $MAX_RCV_EVENTS_LIMIT = 6000; - + #------------------------------------------------------------------------------- # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden # server. If your client timeouts, consider using higher @@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = 60; $LOG_STDERR = 1; #------------------------------------------------------------------------------- -# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added) +# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack +# info added) if reporting to stderr is enabled only #------------------------------------------------------------------------------- -$LOG_VERBOSE = 1; +$LOG_STDERR_VERBOSE = 0; #------------------------------------------------------------------------------- # SYSLOG - enable/disable syslog logging #------------------------------------------------------------------------------- $SYSLOG = 1; +#------------------------------------------------------------------------------- +# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info +# added) if syslog logging is enabled only +#------------------------------------------------------------------------------- +$SYSLOG_VERBOSE = 0; + #------------------------------------------------------------------------------- # SYSLOG_FACILITY - syslog facility #------------------------------------------------------------------------------- diff --git a/src/warden-client/etc/warden-client.conf.tmpl.update b/src/warden-client/etc/warden-client.conf.tmpl.update index 113b751..814482f 100644 --- a/src/warden-client/etc/warden-client.conf.tmpl.update +++ b/src/warden-client/etc/warden-client.conf.tmpl.update @@ -31,7 +31,7 @@ $SSL_CA_CERT = "_CAFILE_"; # consumes app. 250 MB of memory #------------------------------------------------------------------------------- $MAX_RCV_EVENTS_LIMIT = _MAXRCVEVENTSLIMIT_; - + #------------------------------------------------------------------------------- # CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden # server. If your client timeouts, consider using higher @@ -46,15 +46,22 @@ $CONNECTION_TIMEOUT = _CONNECTIONTIMEOUT_; $LOG_STDERR = _LOGSTDERR_; #------------------------------------------------------------------------------- -# LOG_VERBOSE - enable/disable logging in verbose mode (stack info added) +# LOG_STDERR_VERBOSE - enable/disable logging in verbose mode to stderr (stack +# info added) if reporting to stderr is enabled only #------------------------------------------------------------------------------- -$LOG_VERBOSE = _LOGVERBOSE_; +$LOG_STDERR_VERBOSE = _LOGSTDERRVERBOSW_; #------------------------------------------------------------------------------- # SYSLOG - enable/disable syslog logging #------------------------------------------------------------------------------- $SYSLOG = _SYSLOG_; +#------------------------------------------------------------------------------- +# SYSLOG_VERBOSE - enable/disable logging in verbose mode to syslog (stack info +# added) if syslog logging is enabled only +#------------------------------------------------------------------------------- +$SYSLOG_VERBOSE = _SYSLOGVERBOSE_; + #------------------------------------------------------------------------------- # SYSLOG_FACILITY - syslog facility #------------------------------------------------------------------------------- -- GitLab