opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#940: Log error message if config parameter is missing.

remotes/github/python3
Ramón M. Gómez 2020-06-30 19:34:01 +02:00
parent 6900215e9c
commit 68c4c91495
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/opengnsys/modules/server/OpenGnSys/__init__.py
View File

@ -42,6 +42,7 @@ import urllib.error
import urllib.parse import urllib.parse
import urllib.request import urllib.request
from configparser import NoOptionError
from opengnsys import REST, operations, VERSION from opengnsys import REST, operations, VERSION
from opengnsys.log import logger from opengnsys.log import logger
from opengnsys.scriptThread import ScriptExecutorThread from opengnsys.scriptThread import ScriptExecutorThread
@ -114,21 +115,27 @@ class OpenGnSysWorker(ServerWorker):
""" """
Sends OGAgent activation notification to OpenGnsys server Sends OGAgent activation notification to OpenGnsys server
""" """
t = 0 e = None # Error info
t = 0 # Count of time
# Generate random secret to send on activation # Generate random secret to send on activation
self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length)) self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length))
# Ensure cfg has required configuration variables or an exception will be thrown # Ensure cfg has required configuration variables or an exception will be thrown
try:
url = self.service.config.get('opengnsys', 'remote') url = self.service.config.get('opengnsys', 'remote')
except NoOptionError as e:
logger.error("Configuration error: {}".format(e))
raise e
self.REST = REST(url) self.REST = REST(url)
# Execution level ('full' by default) # Execution level ('full' by default)
try: try:
self.exec_level = self.service.config.get('opengnsys', 'level') self.exec_level = self.service.config.get('opengnsys', 'level')
except: except NoOptionError:
self.exec_level = 'full' self.exec_level = 'full'
# Get network interfaces until they are active or timeout (5 minutes) # Get network interfaces until they are active or timeout (5 minutes)
for t in range(0, 300): for t in range(0, 300):
try: try:
self.interface = list(operations.getNetworkInfo())[0] # Get first network interface # Get the first network interface
self.interface = list(operations.getNetworkInfo())[0]
except Exception as e: except Exception as e:
# Wait 1 sec. and retry # Wait 1 sec. and retry
time.sleep(1) time.sleep(1)