Add server reconnection delay time value to the configurable parameters

In case the server failed to respond on initial startup the bridge will
sleep 60 seconds before attempting to connect to the server again.
Now the sleep time could be overwritten with the specified "retryDelay"
value in the config file.

Author: Helene

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bridge_master</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+</pydev_project>

source/config.ini

@@ -28,6 +28,10 @@ server = localhost
 # The https port to use
 serverPort = 9980
 
+# Sleep time in seconds before attempting to connect to the server again
+# in case the server failed to respond on initial startup (maximum 3 attempts)
+retryDelay = 60
+
 # The name of REST HTTPS API key name
 apiKeyName = scale_grafana
 

source/zimonGrafanaIntf.py

@@ -43,7 +43,7 @@
 
 class MetadataHandler():
 
-    def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskData=False):
+    def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskData=False, sleepTime=None):
         self.__qh = None
         self.__sensorsConf = None
         self.__metaData = None
@@ -53,6 +53,7 @@ def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskDat
         self.apiKeyName = apiKeyName
         self.apiKeyValue = apiKeyValue
         self.includeDiskData = includeDiskData
+        self.sleepTime = sleepTime or 60
 
         self.__initializeTables()
 
@@ -89,7 +90,7 @@ def __initializeTables(self):
                     break
                 # if no data returned because of the REST HTTP server is still starting, sleep and retry (max 3 times)
                 self.logger.warning(MSG['NoDataStartNextAttempt'].format(attempt, MAX_ATTEMPTS_COUNT))
-                sleep(60)
+                sleep(self.sleepTime)
             else:
                 foundItems = len(self.metaData.allParents) - 1
                 sensors = self.metaData.sensorsSpec.keys()
@@ -610,7 +611,7 @@ def main(argv):
         logger.info("%s", MSG['BridgeVersionInfo'].format(__version__))
         logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, v) for k, v in args.items() if not k == 'apiKeyValue'))
         # logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, type(v)) for k, v in args.items()))
-        mdHandler = MetadataHandler(logger, args.get('server'), args.get('serverPort'), args.get('apiKeyName'), resolveAPIKeyValue(args.get('apiKeyValue')), args.get('includeDiskData'))
+        mdHandler = MetadataHandler(logger, args.get('server'), args.get('serverPort'), args.get('apiKeyName'), resolveAPIKeyValue(args.get('apiKeyValue')), args.get('includeDiskData'), args.get('retryDelay', None))
     except (AttributeError, TypeError, ValueError) as e:
         logger.details('%s', MSG['IntError'].format(str(e)))
         logger.error(MSG['MetaError'])

tests/test_params.py

@@ -3,10 +3,12 @@
 
 
 def my_setup():
-    global a, b, c, d, e, f, g, m, n, o, p, y
+    global a, b, c, d, e, f, g, m, n, o, p, y, x
     a = ConfigManager().defaults
     y = ConfigManager().defaults.copy()
     y['apiKeyValue'] = '/tmp/mykey'
+    x = ConfigManager().defaults.copy()
+    del x['retryDelay']
     b, c = parse_cmd_args([])
     d, e = parse_cmd_args(['-p', '8443', '-t', '/etc/my_tls'])
     f, g = parse_cmd_args(['-p', '8443', '-t', None, '-k', 'None', '-m', "None"])
@@ -84,3 +86,19 @@ def test_case08():
     assert 'apiKeyValue' in result.keys()
     assert '/' not in str(result.get('apiKeyValue'))
     assert result.get('apiKeyValue') == 'e40960c9-de0a-4c75-bc71-0bcae6db23b2'
+
+
+@with_setup(my_setup)
+def test_case09():
+    result = merge_defaults_and_args(a, b)
+    assert len(result.keys()) > 0
+    assert 'retryDelay' in result.keys()
+    assert isinstance(result.get('retryDelay'), int)
+    assert result.get('retryDelay') == 60
+
+
+@with_setup(my_setup)
+def test_case10():
+    result = merge_defaults_and_args(x, b)
+    assert len(result.keys()) > 0
+    assert 'retryDelay' not in result.keys()