Make readMessage bail if it can't read a message instead of blocking …

…forever (#168) * Make readMessage bail if it can't read a message instead of blocking forever * Only change TerminalClient's call to readMessage
MisterTea · Jan 16, 2019 · 15a14d2 · 15a14d2
1 parent c0c0fe7
commit 15a14d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/base/Connection.hpp b/src/base/Connection.hpp
@@ -15,6 +15,9 @@ class Connection {
 
   virtual ~Connection();
 
+  virtual bool read(string* buf);
+  virtual bool write(const string& buf);
+
   virtual bool readMessage(string* buf);
   virtual void writeMessage(const string& message);
 
@@ -63,8 +66,6 @@ class Connection {
   inline bool isShuttingDown() { return shuttingDown; }
 
  protected:
-  virtual bool read(string* buf);
-  virtual bool write(const string& buf);
   bool recover(int newSocketFd);
 
   shared_ptr<SocketHandler> socketHandler;

diff --git a/src/terminal/TerminalClient.cpp b/src/terminal/TerminalClient.cpp
@@ -427,7 +427,7 @@ int main(int argc, char** argv) {
         while (globalClient->hasData()) {
           VLOG(4) << "GlobalClient has data";
           string packetTypeString;
-          if (!globalClient->readMessage(&packetTypeString)) {
+          if (!globalClient->read(&packetTypeString)) {
             break;
           }
           if (packetTypeString.length() != 1) {