diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index f6f32e3..632b228 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -110,12 +110,12 @@ class OpenGnSysWorker(ServerWorker): def onLogin(self, user): logger.debug('Received login for {}'.format(user)) self.loggedin = True - self.REST.sendMessage('ogagent/loggedin', {'ip': self.interface.ip, "user": user}) + self.REST.sendMessage('ogagent/loggedin', {'ip': self.interface.ip, 'user': user, 'ostype': operations.osType, 'osversion': operations.osVersion}) def onLogout(self, user): logger.debug('Received logout for {}'.format(user)) self.loggedin = False - self.REST.sendMessage('ogagent/loggedout', {'ip': self.interface.ip, "user": user}) + self.REST.sendMessage('ogagent/loggedout', {'ip': self.interface.ip, 'user': user, 'ostype': operations.osType, 'osversion': operations.osVersion}) def process_ogclient(self, path, getParams, postParams): ''' diff --git a/src/opengnsys/operations.py b/src/opengnsys/operations.py index fc241ab..5a5a66e 100644 --- a/src/opengnsys/operations.py +++ b/src/opengnsys/operations.py @@ -36,5 +36,9 @@ from __future__ import unicode_literals import sys if sys.platform == 'win32': from .windows.operations import * # @UnusedWildImport + osType = 'Windows' + osVersion = getWindowsVersion() else: from .linux.operations import * # @UnusedWildImport + osType = 'Linux' + osVersion = getLinuxVersion()