From a0c3aa981bb7ba17730a1c4e9bd89ab1a77fbfa5 Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Mon, 26 Oct 2020 10:00:18 +0100 Subject: [PATCH] B #~: Fix Fireedge Validator (#359) Signed-off-by: Frederick Borges --- .../public/app/utils/fireedge-validator.js | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/sunstone/public/app/utils/fireedge-validator.js b/src/sunstone/public/app/utils/fireedge-validator.js index 67e429d33b..b7f7076738 100644 --- a/src/sunstone/public/app/utils/fireedge-validator.js +++ b/src/sunstone/public/app/utils/fireedge-validator.js @@ -22,23 +22,6 @@ define(function (require) { const fireedge_endpoint = Config.fireedgeEndpoint; const max_tries = Config.maxWaitingTries; const session_var = 'fireedge_running'; - - // Recursive function to validate if Fireedge Server is running - var _is_fireedge_running = function(tries) { - var fireedge_running = sessionStorage.getItem(session_var); - if (!fireedge_running && (tries < max_tries)){ - var success_function = function() { - sessionStorage.setItem(session_var, "true"); - }; - var error_function = function() { - sessionStorage.removeItem(session_var); - setTimeout(function(){ - _is_fireedge_running(tries+1); - }, 1000); - } - _request(success_function,error_function); - } - } // Recursive function to validate if Fireedge Server is running var _is_fireedge_running = function(tries, success_function, error_function) { @@ -58,7 +41,16 @@ define(function (require) { } var _validate_fireedge = function() { - _is_fireedge_running(0); + var success_function = function() { + sessionStorage.setItem(session_var, "true"); + }; + var error_function = function() { + sessionStorage.removeItem(session_var); + setTimeout(function(){ + _is_fireedge_running(tries+1); + }, 1000); + } + _is_fireedge_running(0, success_function, error_function); } var _validate_fireedge_with_functions = function(success,error) {