Merge pull request #15 from avatao-content/pmgeh

Rework TFW process management capabilities

lib/tfw/networking/event_handlers/server_connector.py

@@ -26,6 +26,7 @@ class ServerUplinkConnector(ZMQConnectorBase):
         self._zmq_push_socket.connect('tcp://localhost:{}'.format(tfwenv.RECEIVER_PORT))
 
     def send(self, key, response):
+        response['key'] = key
         self._zmq_push_socket.send_multipart(serialize_all(key, response))
 
 

lib/tfw/networking/server/tfw_server.py

@@ -82,8 +82,7 @@ class FSMUpdater:
 
     def generate_fsm_update(self):
         key = 'FSMUpdate'
-        response = {'key': key,
-                    'data': {'current_state': self.fsm.state,
+        response = {'data': {'current_state': self.fsm.state,
                              'valid_transitions':
                                  [{'trigger': trigger} for trigger in self.fsm.machine.get_triggers(self.fsm.state)]}}
         return key, response