catch Log::write() exceptions and add O_NONBLOCK flags to pipes

Author: Yieen

include/poll/AConnection.hpp

@@ -1,6 +1,8 @@
 #ifndef ACONNECTION_HPP
 #define ACONNECTION_HPP
 
+#include <fcntl.h>
+
 #include <istream>
 #include <queue>
 #include <string>

src/http/Http.cpp

@@ -14,9 +14,12 @@ Http::Http(Address const &client, Address const &host)
 }
 
 Http::~Http() {
-  accessLog_g.write(
-      toString<Address &>(host) + " -> delete: " + toString<Address &>(client),
-      DEBUG);
+  try {
+    accessLog_g.write(toString<Address &>(host) +
+                          " -> delete: " + toString<Address &>(client),
+                      DEBUG);
+  } catch (...) {
+  }
 }
 
 void Http::OnRequestRecv(std::string msg) {

src/main.cpp

@@ -47,9 +47,13 @@ int main(int argc, char** argv) {
       if (!Poll::poll()) break;
     }
   } catch (const std::exception& e) {
-    if (errorLog_g.getInitialized() == false) Log::setLogToTerminal(true, true);
-    errorLog_g.write(e.what(), ERROR);
-    printHelp(PRINT);
+    try {
+      if (errorLog_g.getInitialized() == false)
+        Log::setLogToTerminal(true, true);
+      errorLog_g.write(e.what(), ERROR);
+      printHelp(PRINT);
+    } catch (...) {
+    }
     return 1;
   }
   return 0;

src/poll/AConnection.cpp

@@ -33,13 +33,15 @@ AConnection::~AConnection() {
   }
   if (_cgiPid != -1 && Poll::lastForkPid() != 0) {
     int status;
-    if (kill(_cgiPid, SIGKILL) == -1)
-      errorLog_g.write("ERROR: kill()", DEBUG, BRIGHT_RED);
+    kill(_cgiPid, SIGKILL);
     waitpid(_cgiPid, &status, 0);
-    accessLog_g.write(
-        "reaped CGI process: " + toString<int>(_cgiPid) + " exit status: " +
-            toString<int>(WEXITSTATUS(status)) + " reason: object destructed",
-        DEBUG, BLUE);
+    try {
+      accessLog_g.write(
+          "reaped CGI process: " + toString<int>(_cgiPid) + " exit status: " +
+              toString<int>(WEXITSTATUS(status)) + " reason: object destructed",
+          DEBUG, BLUE);
+    } catch (...) {
+    }
   }
 }
 
@@ -259,8 +261,7 @@ void AConnection::onPipeInPollIn(struct pollfd &pollfd) {
 void AConnection::KillCgi() {
   int status;
 
-  if (kill(_cgiPid, SIGKILL) == -1)
-    errorLog_g.write("ERROR: kill()", DEBUG, BRIGHT_RED);
+  kill(_cgiPid, SIGKILL);
   waitpid(_cgiPid, &status, 0);
   pid_t tmp = _cgiPid;
   _cgiPid = -1;
@@ -377,6 +378,34 @@ void AConnection::onNoPollEvent(struct pollfd &) {
   Poll::setTimeout(timeout);
 }
 
+static bool initPipes(int a[2], int b[2]) {
+  static int const fdsize = 4;
+  int fd[fdsize];
+  int flags[fdsize];
+
+  if (pipe(&(fd[0])) == -1) return false;
+  if (pipe(&(fd[2])) == -1) {
+    close(fd[0]);
+    close(fd[1]);
+    return false;
+  }
+  for (int i = 0; i < fdsize; ++i) {
+    flags[i] = fcntl(fd[i], F_GETFL, 0);
+    if (flags[i] == -1 || fcntl(fd[i], F_SETFL, flags[i] | O_NONBLOCK) == -1) {
+      close(fd[0]);
+      close(fd[1]);
+      close(fd[2]);
+      close(fd[3]);
+      return false;
+    }
+  }
+  a[0] = fd[0];
+  a[1] = fd[1];
+  b[0] = fd[2];
+  b[1] = fd[3];
+  return true;
+}
+
 /**
  * The http object is destroyed after calling fork(). The parameters must still
  * remain valid. program cannot be a reference to Http::cgiProgramPathname
@@ -388,16 +417,9 @@ void AConnection::runCGI(std::string program,
   int pipeInArray[2];
   int pipeOutArray[2];
 
-  if (pipe(pipeInArray) == -1) {
-    errorLog_g.write("ERROR: pipe()", DEBUG, BRIGHT_RED);
-    OnCgiError();
-    return;
-  }
-
-  if (pipe(pipeOutArray)) {
-    errorLog_g.write("ERROR: pipe()", DEBUG, BRIGHT_RED);
-    close(pipeInArray[0]);
-    close(pipeInArray[1]);
+  if (initPipes(pipeInArray, pipeOutArray) == false) {
+    errorLog_g.write(std::string("initPipes(): ") + std::strerror(errno),
+                     ERROR);
     OnCgiError();
     return;
   }

src/poll/ListenSocket.cpp

@@ -97,7 +97,9 @@ void ListenSocket::onPollEvent(struct pollfd &pollfd,
   } catch (std::bad_alloc const &e) {
     close(newPollfd->fd);
     newPollfd->fd = -1;
-    errorLog_g.write("Failed to accept client: ENOMEM", DEBUG,
-                     BRIGHT_RED);  // TODO: implement counter
+    try {
+      errorLog_g.write("Failed to accept client: ENOMEM", DEBUG, BRIGHT_RED);
+    } catch (...) {
+    }
   }
 }

src/poll/Poll.cpp

@@ -73,7 +73,10 @@ bool Poll::poll() {
     throw std::runtime_error(std::string("Poll::poll(): ") +
                              std::strerror(errno));
 
-  if (ready == 0) errorLog_g.write("Poll: no revents", DEBUG, BRIGHT_RED);
+  if (ready == 0) try {
+      errorLog_g.write("Poll: no revents", DEBUG, BRIGHT_RED);
+    } catch (...) {
+    }
   poll.timeout = -1;
   poll.iterate();
   return true;
@@ -166,7 +169,10 @@ void Poll::iterate() {
         ++i;
       }
     } catch (std::exception const &e) {
-      accessLog_g.write(std::string(e.what()), DEBUG);
+      try {
+        accessLog_g.write(std::string(e.what()), DEBUG);
+      } catch (...) {
+      }
       remove(callbackObjects[i].ptr);
       release(newCallbackObject, newPollfd,
               sizeof(newPollfd) / sizeof(*newPollfd));