* Added "requestLogoff", to be invoked before "user removal" of a

service

server/src/uds/core/managers/UserServiceManager.py

@@ -51,7 +51,7 @@ import requests
 import json
 import logging
 
-__updated__ = '2017-10-26'
+__updated__ = '2017-11-17'
 
 logger = logging.getLogger(__name__)
 traceLogger = logging.getLogger('traceLog')
@@ -428,6 +428,28 @@ class UserServiceManager(object):
 
         # All done
 
+    def requestLogoff(self, uService):
+        '''
+        Ask client to logoff user
+        '''
+        url = uService.getCommsUrl()
+        if url is None:
+            logger.error('Can\'t connect with actor (no actor or legacy actor)')
+            return
+        url += '/logoff'
+
+        try:
+            r = requests.post(url, data=json.dumps({}), headers={'content-type': 'application/json'}, verify=False, timeout=4)
+            r = json.loads(r.content)
+            logger.debug('Sent logoff to client using {}: {}'.format(url, r))
+            # In fact we ignore result right now
+        except Exception as e:
+            # TODO: Right now, this is an "experimental" feature, not supported on Apps (but will)
+            pass
+            # logger.info('Logoff requested but service was not listening: {}'.format(e, url))
+
+        # All done
+
     def checkForRemoval(self, uService):
         '''
         This method is used by UserService when a request for setInUse(False) is made
@@ -517,12 +539,10 @@ class UserServiceManager(object):
         if user is not None:
             userName = user.name
 
-
         if doTest is False:
             # traceLogger.info('GOT service "{}" for user "{}" with transport "{}" (NOT TESTED)'.format(userService.name, userName, trans.name))
             return (None, userService, None, trans, None)
 
-
         serviceNotReadyCode = 0x0001
         ip = 'unknown'
         # Test if the service is ready
@@ -532,6 +552,7 @@ class UserServiceManager(object):
             # If ready, show transport for this service, if also ready ofc
             iads = userService.getInstance()
             ip = iads.getIp()
+            userService.logIP(ip)  # Update known ip
 
             if self.checkUuid(userService) is False:  # Machine is not what is expected
                 serviceNotReadyCode = 0x0004

server/src/uds/web/views/service.py

@@ -56,7 +56,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-__updated__ = '2017-10-26'
+__updated__ = '2017-11-16'
 
 
 @webLoginRequired(admin=False)
@@ -145,7 +145,6 @@ def clientEnabler(request, idService, idTransport):
         logger.exception('Error')
         error = six.text_type(e)
 
-
     return HttpResponse(
         json.dumps({
             'url': six.text_type(url),
@@ -154,6 +153,7 @@ def clientEnabler(request, idService, idTransport):
         content_type='application/json'
     )
 
+
 @webLoginRequired(admin=False)
 @never_cache
 def release(request, idService):
@@ -167,8 +167,8 @@ def release(request, idService):
             "Removing User Service {} as requested by {} from {}".format(userService.friendly_name, request.user.pretty_name, request.ip),
             log.WEB
         )
+        userServiceManager().requestLogoff(userService)
         userService.release()
 
-
     return HttpResponseRedirect(reverse('Index'))