/*
* 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
* it under the terms of the GNU General Public License as published by
#include "event.h"
#include "log.h"
-struct logfd_state {
- const char *tag;
-};
-
/* called when bytes are available and at eof */
static int logfd_readable(ev_source attribute((unused)) *ev,
ev_reader *reader,
- int fd,
void *ptr,
size_t bytes,
int eof,
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 */
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);
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
+ * 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))
+ if(!ev_reader_new(ev, p[0], logfd_readable, logfd_error, (void *)tag,
+ "logfd"))
fatal(errno, "error calling ev_reader_new");
return p[1];
}
indent-tabs-mode:nil
End:
*/
-/* arch-tag:zVrHlzk2xWMLo9nDM803pA */