refs #702 use instance variables
parent
9d6596668f
commit
9d3a320f36
|
@ -79,15 +79,6 @@ class ogAdmClientWorker (ServerWorker):
|
||||||
random = None # Random string for secure connections
|
random = None # Random string for secure connections
|
||||||
length = 32 # Random string length
|
length = 32 # Random string length
|
||||||
|
|
||||||
pathinterface = None
|
|
||||||
IPlocal = None
|
|
||||||
idordenador = None
|
|
||||||
nombreordenador = None
|
|
||||||
cache = None
|
|
||||||
idproautoexec = None
|
|
||||||
idcentro = None
|
|
||||||
idaula = None
|
|
||||||
|
|
||||||
def onDeactivation (self):
|
def onDeactivation (self):
|
||||||
"""
|
"""
|
||||||
Sends OGAgent stopping notification to OpenGnsys server
|
Sends OGAgent stopping notification to OpenGnsys server
|
||||||
|
@ -436,21 +427,30 @@ class ogAdmClientWorker (ServerWorker):
|
||||||
"""
|
"""
|
||||||
Sends OGAgent activation notification to OpenGnsys server
|
Sends OGAgent activation notification to OpenGnsys server
|
||||||
"""
|
"""
|
||||||
|
self.pathinterface = None
|
||||||
|
self.IPlocal = None ## Ip del ordenador
|
||||||
|
self.idordenador = None ## Identificador del ordenador
|
||||||
|
self.nombreordenador = None ## Nombre del ordenador
|
||||||
|
self.cache = None
|
||||||
|
self.idproautoexec = None
|
||||||
|
self.idcentro = None ## Identificador del centro
|
||||||
|
self.idaula = None ## Identificador del aula
|
||||||
|
|
||||||
# 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:
|
try:
|
||||||
url = self.service.config.get ('ogAdmClient', 'remote')
|
url = self.service.config.get ('ogAdmClient', 'remote')
|
||||||
loglevel = self.service.config.get ('ogAdmClient', 'log')
|
loglevel = self.service.config.get ('ogAdmClient', 'log')
|
||||||
#servidorAdm = self.service.config.get ('ogAdmClient', 'servidorAdm')
|
#self.servidorAdm = self.service.config.get ('ogAdmClient', 'servidorAdm')
|
||||||
#puerto = self.service.config.get ('ogAdmClient', 'puerto')
|
#self.puerto = self.service.config.get ('ogAdmClient', 'puerto')
|
||||||
self.pathinterface = self.service.config.get ('ogAdmClient', 'pathinterface')
|
self.pathinterface = self.service.config.get ('ogAdmClient', 'pathinterface')
|
||||||
urlMenu = self.service.config.get ('ogAdmClient', 'urlMenu')
|
self.urlMenu = self.service.config.get ('ogAdmClient', 'urlMenu')
|
||||||
#urlMsg = self.service.config.get ('ogAdmClient', 'urlMsg')
|
self.urlMsg = self.service.config.get ('ogAdmClient', 'urlMsg')
|
||||||
logger.setLevel (loglevel)
|
|
||||||
except NoOptionError as e:
|
except NoOptionError as e:
|
||||||
logger.error ("Configuration error: {}".format (e))
|
logger.error ("Configuration error: {}".format (e))
|
||||||
raise e
|
raise e
|
||||||
|
logger.setLevel (loglevel)
|
||||||
self.REST = REST (url)
|
self.REST = REST (url)
|
||||||
|
|
||||||
if not self.tomaIPlocal():
|
if not self.tomaIPlocal():
|
||||||
|
|
Loading…
Reference in New Issue