#975: OGAgent sends version number at startup.

remotes/github/python3
Ramón M. Gómez 2020-04-30 11:00:22 +02:00
parent e298c499c9
commit a850bd1236
1 changed files with 6 additions and 5 deletions

View File

@ -30,18 +30,17 @@
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import threading
import os import os
import platform import platform
import time import time
import random import random
import shutil import shutil
import string import string
import threading
import urllib import urllib
from opengnsys.workers import ServerWorker from opengnsys.workers import ServerWorker
from opengnsys import REST, RESTError from opengnsys import REST, RESTError, operations, VERSION
from opengnsys import operations
from opengnsys.log import logger from opengnsys.log import logger
from opengnsys.scriptThread import ScriptExecutorThread from opengnsys.scriptThread import ScriptExecutorThread
@ -116,7 +115,8 @@ class OpenGnSysWorker(ServerWorker):
try: try:
self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip, self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip,
'secret': self.random, 'ostype': operations.os_type, 'secret': self.random, 'ostype': operations.os_type,
'osversion': operations.os_version}) 'osversion': operations.os_version,
'agent_version': VERSION})
break break
except: except:
# Trying to initialize on alternative server, if defined # Trying to initialize on alternative server, if defined
@ -124,7 +124,8 @@ class OpenGnSysWorker(ServerWorker):
self.REST = REST(self.service.config.get('opengnsys', 'altremote')) self.REST = REST(self.service.config.get('opengnsys', 'altremote'))
self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip, self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip,
'secret': self.random, 'ostype': operations.os_type, 'secret': self.random, 'ostype': operations.os_type,
'osversion': operations.os_version, 'alt_url': True}) 'osversion': operations.os_version, 'alt_url': True,
'agent_version': VERSION})
break break
except: except:
time.sleep(3) time.sleep(3)