Synchronize with trunk

[disorder] / lib / logfd.c

diff --git a/lib/logfd.c b/lib/logfd.c
index e644e6c067cb913bd42719f8a2750c4fe5f577f6..71751088461a0c9163572f157aee340f2c8ff6c0 100644 (file)
--- a/lib/logfd.c
+++ b/lib/logfd.c
@@ -1,28 +1,27 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005 Richard Kettlewell
+ * Copyright (C) 2005, 2007 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/logfd.c
+ * @brief Redirect subprocess stderr to DisOrder server's log
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "syscalls.h"
@@ -30,14 +29,9 @@
 #include "event.h"
 #include "log.h"
 
-struct logfd_state {
-  const char *tag;
-};
-
-/* called when bytes are available and at eof */
+/** @brief Called when a log FD is readable */
 static int logfd_readable(ev_source attribute((unused)) *ev,
                          ev_reader *reader,
-                         int fd,
                          void *ptr,
                          size_t bytes,
                          int eof,
@@ -49,39 +43,48 @@ static int logfd_readable(ev_source attribute((unused)) *ev,
   while((nl = memchr(ptr, '\n', bytes))) {
     len = nl - (char *)ptr;
     ev_reader_consume(reader, len + 1);
-    info("%s: %.*s", tag, len, (char *)ptr);
+    disorder_info("%s: %.*s", tag, len, (char *)ptr);
     ptr = nl + 1;
     bytes -= len + 1;
   }
   if(eof && bytes) {
-    info("%s: %.*s", tag, (int)bytes, (char *)ptr);
+    disorder_info("%s: %.*s", tag, (int)bytes, (char *)ptr);
     ev_reader_consume(reader, bytes);
   }
-  if(eof)
-    xclose(fd);
   return 0;
 }
 
-/* called when a read error occurs */
+/** @brief Called when a log FD errors */
 static int logfd_error(ev_source attribute((unused)) *ev,
-                      int fd,
                       int errno_value,
                       void *u) {
   const char *tag = u;
   
-  error(errno_value, "error reading log pipe from %s", tag);
-  xclose(fd);
+  disorder_error(errno_value, "error reading log pipe from %s", tag);
   return 0;
 }
 
+/** @brief Create file descriptor for a subprocess to log to
+ * @param ev Event loop
+ * @param tag Tag for this log
+ * @return File descriptor
+ *
+ * Returns a file descriptor which a subprocess can log to.  The normal thing
+ * to do would be to dup2() this fd onto the subprocess's stderr (and to close
+ * it in the parent).
+ *
+ * Any lines written to this fd (i.e. by the subprocess) will be logged via
+ * disorder_info(), with @p tag included.
+ */
 int logfd(ev_source *ev, const char *tag) {
   int p[2];
 
   xpipe(p);
   cloexec(p[0]);
   nonblock(p[0]);
-  if(!ev_reader_new(ev, p[0], logfd_readable, logfd_error, (void *)tag))
-    fatal(errno, "error calling ev_reader_new");
+  if(!ev_reader_new(ev, p[0], logfd_readable, logfd_error, (void *)tag,
+                    "logfd"))
+    disorder_fatal(errno, "error calling ev_reader_new");
   return p[1];
 }
 
@@ -93,4 +96,3 @@ fill-column:79
 indent-tabs-mode:nil
 End:
 */
-/* arch-tag:zVrHlzk2xWMLo9nDM803pA */