RPC container content fix (#232)

* Fix RPC edge case * Format code (cherry picked from commit 5de1fad)
ucbrise · Jun 27, 2017 · d70348a · d70348a
1 parent a3ee768
commit d70348a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/containers/python/rpc.py b/containers/python/rpc.py
@@ -302,7 +302,7 @@ def run(self):
 
                         t4 = datetime.now()
 
-                        response.send(socket)
+                        response.send(socket, self.event_history)
 
                         print("recv: %f us, parse: %f us, handle: %f us" %
                               ((t2 - t1).microseconds, (t3 - t2).microseconds,
@@ -313,7 +313,7 @@ def run(self):
                     else:
                         feedback_request = FeedbackRequest(msg_id_bytes, [])
                         response = self.handle_feedback_request(received_msg)
-                        response.send(socket)
+                        response.send(socket, self.event_history)
                         print("recv: %f us" % ((t2 - t1).microseconds))
 
                 sys.stdout.flush()
@@ -394,13 +394,14 @@ def add_output(self, output):
                      self.string_content_end_position + output_len] = output
         self.string_content_end_position += output_len
 
-    def send(self, socket):
+    def send(self, socket, event_history):
         socket.send("", flags=zmq.SNDMORE)
         socket.send(
             struct.pack("<I", MESSAGE_TYPE_CONTAINER_CONTENT),
             flags=zmq.SNDMORE)
         socket.send(self.msg_id, flags=zmq.SNDMORE)
         socket.send(self.output_buffer[0:self.string_content_end_position])
+        event_history.insert(EVENT_HISTORY_SENT_CONTAINER_CONTENT)
 
     def expand_buffer_if_necessary(self, size):
         if len(self.output_buffer) < size:

diff --git a/src/libclipper/src/rpc_service.cpp b/src/libclipper/src/rpc_service.cpp
@@ -271,13 +271,13 @@ void RPCService::receive_message(
         zmq_connection_id += 1;
       }
     } break;
-    case MessageType::ContainerContent:
+    case MessageType::ContainerContent: {
+      // This message is a response to a container query
+      message_t msg_id;
+      message_t msg_content;
+      socket.recv(&msg_id, 0);
+      socket.recv(&msg_content, 0);
       if (!new_connection) {
-        // This message is a response to a container query
-        message_t msg_id;
-        message_t msg_content;
-        socket.recv(&msg_id, 0);
-        socket.recv(&msg_content, 0);
         int id = static_cast<int *>(msg_id.data())[0];
         vector<uint8_t> content(
             (uint8_t *)msg_content.data(),
@@ -303,7 +303,7 @@ void RPCService::receive_message(
 
         response_queue_->push(response);
       }
-      break;
+    } break;
     case MessageType::Heartbeat:
       send_heartbeat_response(socket, connection_id, new_connection);
       break;