[feature] Add extra interval parameters for retries

Author: okraits

README.rst

@@ -69,6 +69,8 @@ UCI configuration options must go in ``/etc/config/openwisp``.
 
 - ``url``: url of controller, eg: ``https://controller.openwisp.org``
 - ``interval``: time in seconds between checks for changes to the configuration, defaults to ``120``
+- ``management_interval``: time in seconds between the management ip discovery attempts, defaults to ``$interval/12``
+- ``registration_interval``: time in seconds between the registration attempts, defaults to ``$interval/4``
 - ``verify_ssl``: whether SSL verification must be performed or not, defaults to ``1``
 - ``shared_secret``: shared secret, needed for `Automatic registration`_
 - ``consistent_key``: whether `Consistent key generation`_ is enabled or not, defaults to ``1``

openwisp-config/files/openwisp-nossl.config

@@ -4,6 +4,8 @@
 config controller 'http'
 	#option url 'http://openwisp2.mynetwork.com'
 	#option interval '120'
+	#option management_interval '10'
+	#option registration_interval '30'
 	option verify_ssl '0'
 	#option shared_secret ''
 	#option consistent_key '1'

openwisp-config/files/openwisp-ssl.config

@@ -4,6 +4,8 @@
 config controller 'http'
 	#option url 'https://openwisp2.mynetwork.com'
 	#option interval '120'
+	#option management_interval '10'
+	#option registration_interval '30'
 	#option verify_ssl '1'
 	#option shared_secret ''
 	#option consistent_key '1'

openwisp-config/files/openwisp.agent

@@ -6,6 +6,8 @@ while [ -n "$1" ]; do
 		--version|-v) export VERSION=1; break;;
 		--url) export URL=${2%/}; shift;;  # strip trailing slash
 		--interval) export INTERVAL=$2; shift;;
+		--management_interval) export MANAGEMENT_INTERVAL="$2"; shift;;
+		--registration_interval) export REGISTRATION_INTERVAL="$2"; shift;;
 		--verify-ssl) export VERIFY_SSL=$2; shift;;
 		--uuid) export UUID="$2"; shift;;
 		--key) export KEY="$2"; shift;;
@@ -60,6 +62,8 @@ if ([ -z "$UUID" ] || [ -z "$KEY" ]) && [ -z "$SHARED_SECRET" ]; then
 fi
 
 INTERVAL=${INTERVAL:-120}
+MANAGEMENT_INTERVAL=${MANAGEMENT_INTERVAL:-$(expr $INTERVAL / 12)}
+REGISTRATION_INTERVAL=${REGISTRATION_INTERVAL:-$(expr $INTERVAL / 4)}
 VERIFY_SSL=${VERIFY_SSL:-1}
 MERGE_CONFIG=${MERGE_CONFIG:-1}
 TEST_CONFIG=${TEST_CONFIG:-1}
@@ -641,12 +645,11 @@ discover_management_ip(){
 			MANAGEMENT_IP=$(/usr/sbin/openwisp-get-address $MANAGEMENT_INTERFACE)
 
 			if [ -z "$MANAGEMENT_IP" ]; then
-				retry_after=$(expr $INTERVAL / 12)
 				logger -s "management interface not ready (attempt $attempt of $MAX_ATTEMPTS)" \
 				       -t openwisp \
 				       -p daemon.notice
 				if [ $attempt -lt $MAX_ATTEMPTS ]; then
-					sleep $retry_after
+					sleep $MANAGEMENT_INTERVAL
 				else
 					logger -s "could not determine ip address of management interface, giving up..." \
 					       -t openwisp \
@@ -674,11 +677,11 @@ handle_sigusr1() {
 # otherwise perform registration
 if [ -z "$UUID" ] || [ -z "$KEY" ]; then
 	# do not crash if controller can't be reached
-	# but retry every ($INTERVAL / 4) seconds
+	# but retry every $REGISTRATION_INTERVAL seconds
 	# (device might be unplugged, unconfigured or connecting)
 	until register
 	do
-		sleep $(expr $INTERVAL / 4)
+		sleep $REGISTRATION_INTERVAL
 	done
 	touch "$BOOTUP"
 fi

openwisp-config/files/openwisp.init

@@ -20,6 +20,8 @@ parse_config() {
 	local cfg="$1"
 	add_option "$cfg" "--url" url
 	add_option "$cfg" "--interval" interval
+	add_option "$cfg" "--management_interval" management_interval
+	add_option "$cfg" "--registration_interval" registration_interval
 	add_option "$cfg" "--verify-ssl" verify_ssl
 	add_option "$cfg" "--uuid" uuid
 	add_option "$cfg" "--key" key