0
@@ -48,6 +48,7 @@
0
  *       If the other side of the communication channel first tries to
0
  *       receive a file descriptor, and then tries to receive a message,
0
  *       then bad things will happen.
0
+ * @note MessageChannel is thread-safe.
0
  */
0
 class MessageChannel {
0
 private:

0
@@ -118,16 +118,18 @@
0
       }
0
       
0
       execlp(rubyCommand.c_str(), rubyCommand.c_str(), spawnServerCommand.c_str(), NULL);
0
-			fprintf(stderr, "Unable to run %s: %s\n", rubyCommand.c_str(), strerror(errno));
0
+			int e = errno;
0
+			fprintf(stderr, "Unable to run %s: %s\n", rubyCommand.c_str(), strerror(e));
0
       _exit(1);
0
     } else if (pid == -1) {
0
+			int e = errno;
0
       close(fds[0]);
0
       close(fds[1]);
0
       if (logFileHandle != NULL) {
0
         fclose(logFileHandle);
0
       }
0
       pid = 0;
0
-			throw SystemException("Unable to fork a process", errno);
0
+			throw SystemException("Unable to fork a process", e);
0
     } else {
0
       close(fds[1]);
0
       if (!logFile.empty()) {
0
@@ -224,6 +226,8 @@
0
     mutex::scoped_lock l(lock);
0
     
0
     if (serverNeedsRestart) {
0
+			// TODO: This is not the best place to restart the server.
0
+			// Ideally a spawn() should fail as least as possible.
0
       try {
0
         P_TRACE("Restarting spawn server.");
0
         restartServer();