From a506b12ff3de6c5927df7e75ffdaa5fe6e53341c Mon Sep 17 00:00:00 2001 From: Jan Soukal <soukal@ics.muni.cz> Date: Thu, 14 Mar 2013 17:59:59 +0100 Subject: [PATCH] opraveno generovani konfiguraku (ukoly 925 a 927) --- src/warden-client/sh/install.sh | 14 +++++++++++--- src/warden-client/sh/update.sh | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh index 8e70ec0..7f1a562 100755 --- a/src/warden-client/sh/install.sh +++ b/src/warden-client/sh/install.sh @@ -217,14 +217,22 @@ make_conf_file() #------------------------------------------------------------------------------- \$MAX_RCV_EVENTS_LIMIT = 6000; #consumes app. 250 MB of memory +#------------------------------------------------------------------------------- +# CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden +# server. If your client timeouts, consider using higher +# timeout number. Also, in case of receiving clients, you +# can optimize the MAX_RCV_EVENTS_LIMIT value. +#------------------------------------------------------------------------------- +$CONNECTION_TIMEOUT = 60; + #------------------------------------------------------------------------------- # Log options # # LOG_STDERR, LOG_SYSLOG - hide (0) or allow (1) error reporting on STDERR # and/or to Syslog -# LOG_STDERR_VERBOSE, LOG_SYSLOG_VERBOSE - print only error message without -# a stack (0) or print debug info -# including err. message and stack (1) +# LOG_SYSLOG_FACILITY - specify a Syslog facility to log in +# LOG_VERBOSE - print only error message without a stack (0) or print debug info +# including err. message and stack (1) #------------------------------------------------------------------------------- \$LOG_STDERR = 1; diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh index a08085c..fcc1f9d 100755 --- a/src/warden-client/sh/update.sh +++ b/src/warden-client/sh/update.sh @@ -185,6 +185,7 @@ make_conf_file() ssl_cert_file=`cat $conf_file | grep '$SSL_CERT_FILE'` ssl_ca_file=`cat $conf_file | grep '$SSL_CA_FILE'` max_rcv_events_limit=`cat $conf_file | grep '$MAX_RCV_EVENTS_LIMIT'` + connection_timeout=`cat $conf_file | grep '$CONNECTION_TIMEOUT'` log_stderr=`cat $conf_file | grep '$LOG_STDERR'` if [ -z $log_stderr ]; then @@ -236,14 +237,22 @@ $ssl_ca_file #------------------------------------------------------------------------------- $max_rcv_events_limit +#------------------------------------------------------------------------------- +# CONNECTION_TIMEOUT - interval in seconds to timeout connection with Warden +# server. If your client timeouts, consider using higher +# timeout number. Also, in case of receiving clients, you +# can optimize the MAX_RCV_EVENTS_LIMIT value. +#------------------------------------------------------------------------------- +$connection_timeout + #------------------------------------------------------------------------------- # Log options # # LOG_STDERR, LOG_SYSLOG - hide (0) or allow (1) error reporting on STDERR # and/or to Syslog -# LOG_STDERR_VERBOSE, LOG_SYSLOG_VERBOSE - print only error message without -# a stack (0) or print debug info -# including err. message and stack (1) +# LOG_SYSLOG_FACILITY - specify a Syslog facility to log in +# LOG_VERBOSE - print only error message without a stack (0) or print debug info +# including err. message and stack (1) #------------------------------------------------------------------------------- $log_stderr -- GitLab