server_split now handles exception when deserializing (#81)

Author: JohanMabille

src/server/xcontrol.cpp

@@ -62,14 +62,7 @@ namespace xeus
         zmq::multipart_t wire_msg;
         if (wire_msg.recv(m_control, flags))
         {
-            try
-            {
-                return p_server->deserialize(wire_msg);
-            }
-            catch (std::exception& e)
-            {
-                std::cerr << e.what() << std::endl;
-            }
+            return p_server->deserialize(wire_msg);
         }
         return std::nullopt;
     }

src/server/xserver_zmq_split_impl.cpp

@@ -7,6 +7,8 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
+#include <iostream>
+
 #include "xserver_zmq_split_impl.hpp"
 #include "../common/xzmq_serializer.hpp"
 
@@ -134,9 +136,17 @@ namespace xeus
         config.m_hb_port = m_heartbeat.get_port();
     }
 
-    xmessage xserver_zmq_split_impl::deserialize(zmq::multipart_t& wire_msg) const
+    std::optional<xmessage> xserver_zmq_split_impl::deserialize(zmq::multipart_t& wire_msg) const
     {
-        return xzmq_serializer::deserialize(wire_msg, *p_auth);
+        try
+        {
+            return xzmq_serializer::deserialize(wire_msg, *p_auth);
+        }
+        catch (std::exception& e)
+        {
+            std::cerr << e.what() << std::endl;
+        }
+        return std::nullopt;
     }
 
     zmq::multipart_t xserver_zmq_split_impl::serialize_iopub(xpub_message&& msg)

src/server/xserver_zmq_split_impl.hpp

@@ -63,7 +63,7 @@ namespace xeus
         void abort_queue(const listener& l, long polling_interval);
         void update_config(xconfiguration& config) const;
 
-        xmessage deserialize(zmq::multipart_t& wire_msg) const;
+        std::optional<xmessage> deserialize(zmq::multipart_t& wire_msg) const;
         zmq::multipart_t serialize_iopub(xpub_message&& msg);
 
     private:

src/server/xshell.cpp

@@ -9,7 +9,6 @@
 
 #include <thread>
 #include <chrono>
-#include <iostream>
 
 #include "xserver_zmq_split_impl.hpp"
 #include "xshell.hpp"
@@ -86,14 +85,7 @@ namespace xeus
         zmq::multipart_t wire_msg;
         if (wire_msg.recv(m_shell, flags))
         {
-            try
-            {
-                return p_server->deserialize(wire_msg);
-            }
-            catch(std::exception& e)
-            {
-                std::cerr << e.what() << std::endl;
-            }
+            return p_server->deserialize(wire_msg);
         }
         return std::nullopt;
     }
@@ -118,15 +110,7 @@ namespace xeus
         message.send(m_stdin);
         zmq::multipart_t wire_msg;
         wire_msg.recv(m_stdin);
-        try
-        {
-            return p_server->deserialize(wire_msg);
-        }
-        catch (std::exception& e)
-        {
-            std::cerr << e.what() << std::endl;
-        }
-        return std::nullopt;
+        return p_server->deserialize(wire_msg);
     }
 
     void xshell::send_controller(std::string message)
@@ -151,14 +135,10 @@ namespace xeus
                 return;
             }
 
-            try
-            {
-                xmessage msg = p_server->deserialize(wire_msg);
-                l(std::move(msg));
-            }
-            catch (std::exception& e)
+            auto msg = p_server->deserialize(wire_msg);
+            if (msg)
             {
-                std::cerr << e.what() << std::endl;
+                l(std::move(msg.value()));
             }
             std::this_thread::sleep_for(std::chrono::milliseconds(polling_interval));
         }