From 6a01818ef7f77b20730100585243d6df4c01d001 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 19 Apr 2024 11:12:43 +0200 Subject: [PATCH] refs #330: if cannot connect to server, throw error --- .../modules/server/OpenGnSys/__init__.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index 0befc36..82414b9 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -149,8 +149,10 @@ class OpenGnSysWorker(ServerWorker): # Raise error after timeout if not self.interface: raise e + # Loop to send initialization message - for t in range(0, 100): + init_retries = 100 + for t in range(0, init_retries): try: try: self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip, @@ -158,7 +160,8 @@ class OpenGnSysWorker(ServerWorker): 'osversion': operations.os_version, 'agent_version': VERSION}) break - except: + except Exception as e: + logger.warn (str (e)) # Trying to initialize on alternative server, if defined # (used in "exam mode" from the University of Seville) self.REST = REST(self.service.config.get('opengnsys', 'altremote')) @@ -167,13 +170,15 @@ class OpenGnSysWorker(ServerWorker): 'osversion': operations.os_version, 'alt_url': True, 'agent_version': VERSION}) break - except: + except Exception as e: + logger.warn (str (e)) time.sleep(3) # Raise error after timeout - if 0 < t < 100: + if t < init_retries-1: logger.debug('Successful connection after {} tries'.format(t)) - elif t == 100: + elif t == init_retries-1: raise Exception('Initialization error: Cannot connect to remote server') + # Delete marking files for f in ['ogboot.me', 'ogboot.firstboot', 'ogboot.secondboot']: try: