result from merge with gerrit

secop subdir only

Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1

secop/protocol/dispatcher.py

@@ -48,7 +48,7 @@ from secop.params import Parameter
 from secop.protocol.messages import COMMANDREPLY, DESCRIPTIONREPLY, \
     DISABLEEVENTSREPLY, ENABLEEVENTSREPLY, ERRORPREFIX, EVENTREPLY, \
     HEARTBEATREPLY, IDENTREPLY, IDENTREQUEST, READREPLY, WRITEREPLY, \
-    ERRORCLOSED
+    LOGGING_REPLY, LOG_EVENT
 
 
 def make_update(modulename, pobj):
@@ -83,6 +83,7 @@ class Dispatcher:
         # eventname is <modulename> or <modulename>:<parametername>
         self._subscriptions = {}
         self._lock = threading.RLock()
+        self.name = name
         self.restart = srv.restart
         self.shutdown = srv.shutdown
 
@@ -215,9 +216,14 @@ class Dispatcher:
         if cobj is None:
             raise NoSuchCommandError('Module %r has no command %r' % (modulename, cname or exportedname))
 
+        if cobj.argument:
+            argument = cobj.argument.import_value(argument)
         # now call func
         # note: exceptions are handled in handle_request, not here!
-        return cobj.do(moduleobj, argument), dict(t=currenttime())
+        result = cobj.do(moduleobj, argument)
+        if cobj.result:
+            result = cobj.result.export_value(result)
+        return result, dict(t=currenttime())
 
     def _setParameterValue(self, modulename, exportedname, value):
         moduleobj = self.get_module(modulename)
@@ -237,13 +243,9 @@ class Dispatcher:
 
         # validate!
         value = pobj.datatype(value)
-        writefunc = getattr(moduleobj, 'write_%s' % pname, None)
         # note: exceptions are handled in handle_request, not here!
-        if writefunc:
-            # return value is ignored here, as it is automatically set on the pobj and broadcast
-            writefunc(value)
-        else:
-            setattr(moduleobj, pname, value)
+        getattr(moduleobj, 'write_' + pname)(value)
+        # return value is ignored here, as already handled
         return pobj.export_value(), dict(t=pobj.timestamp) if pobj.timestamp else {}
 
     def _getParameterValue(self, modulename, exportedname):
@@ -260,11 +262,9 @@ class Dispatcher:
             # raise ReadOnlyError('This parameter is constant and can not be accessed remotely.')
             return pobj.datatype.export_value(pobj.constant)
 
-        readfunc = getattr(moduleobj, 'read_%s' % pname, None)
-        if readfunc:
-            # should also update the pobj (via the setter from the metaclass)
-            # note: exceptions are handled in handle_request, not here!
-            readfunc()
+        # note: exceptions are handled in handle_request, not here!
+        getattr(moduleobj, 'read_' + pname)()
+        # return value is ignored here, as already handled
         return pobj.export_value(), dict(t=pobj.timestamp) if pobj.timestamp else {}
 
     #
@@ -299,7 +299,6 @@ class Dispatcher:
         self.log.error('should have been handled in the interface!')
 
     def handle__ident(self, conn, specifier, data):
-        self._active_connections.discard(conn)
         return (IDENTREPLY, None, None)
 
     def handle_describe(self, conn, specifier, data):
@@ -378,10 +377,7 @@ class Dispatcher:
 
     def send_log_msg(self, conn, modname, level, msg):
         """send log message """
-        if conn in self._connections:
-            conn.send_reply(('log', '%s:%s' % (modname, level), msg))
-            return True
-        return False
+        conn.send_reply((LOG_EVENT, '%s:%s' % (modname, level), msg))
 
     def set_all_log_levels(self, conn, level):
         for modobj in self._modules.values():
@@ -390,19 +386,7 @@ class Dispatcher:
     def handle_logging(self, conn, specifier, level):
         if specifier and specifier != '.':
             modobj = self._modules[specifier]
-            iodev = getattr(modobj, '_iodev', None)
-            if iodev and iodev.remoteLogHandler is None:
-                iodev.setRemoteLogging(conn, 'off')
-                iodev.remoteLogHandler.used_by.add(modobj)
             modobj.setRemoteLogging(conn, level)
         else:
             self.set_all_log_levels(conn, level)
-        return 'logging', specifier, level
-
-    def close(self):
-        for conn in self._connections:
-            try:
-                # - may be used for the 'closed' message in serial interface
-                conn.close_message((ERRORCLOSED, None, None))
-            except AttributeError:
-                pass
+        return LOGGING_REPLY, specifier, level