commit 66ff0989c59c557c60a75dc1afd109313e39bba1
author Davide Pesavento <davide.pesavento@lip6.fr> Thu Jan 29 22:39:00 2015 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 02 17:59:02 2015 +0100
tree a4ffc3ffd3380fa2bcabdca010c0c32f6d20055d
parent e46279dc8382316fb933697346b66f22cad1ee5e

face: cleanup log messages in all faces and print fail reason

Change-Id: I405198b375a0317663d29810ee87922a19edccaa
Refs: #2450

daemon/face/websocket-face.hpp

diff --git a/daemon/face/websocket-face.hpp b/daemon/face/websocket-face.hpp
index 56dd015..711699b 100644
--- a/daemon/face/websocket-face.hpp
+++ b/daemon/face/websocket-face.hpp
@@ -55,14 +55,14 @@
                 websocketpp::connection_hdl hdl, websocket::Server& server);
 
   // from Face
-  virtual void
-  sendInterest(const Interest& interest);
+  void
+  sendInterest(const Interest& interest) DECL_OVERRIDE;
 
-  virtual void
-  sendData(const Data& data);
+  void
+  sendData(const Data& data) DECL_OVERRIDE;
 
-  virtual void
-  close();
+  void
+  close() DECL_OVERRIDE;
 
   void
   setPingEventId(scheduler::EventId& id)
@@ -70,6 +70,10 @@
     m_pingEventId = id;
   }
 
+protected:
+  // friend because it needs to invoke protected handleReceive
+  friend class WebSocketChannel;
+
   void
   handleReceive(const std::string& msg);