aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-07 16:03:47 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-07 16:03:47 +0000
commitc835eb63e1052bf0bdaf4c2c14f778e3be514659 (patch)
tree00f655626b8e3f96a98813f45a4d634344728eb3
parentbdcf5c47f4ed256e38eda6aa2c652681f1c45e61 (diff)
downloadpaludis-c835eb63e1052bf0bdaf4c2c14f778e3be514659.tar.gz
paludis-c835eb63e1052bf0bdaf4c2c14f778e3be514659.tar.xz
Better log messages
-rw-r--r--paludis/util/pstream.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/paludis/util/pstream.cc b/paludis/util/pstream.cc
index c6750a1..afa23e3 100644
--- a/paludis/util/pstream.cc
+++ b/paludis/util/pstream.cc
@@ -85,6 +85,8 @@ PStreamInBuf::PStreamInBuf(const Command & cmd) :
if (cmd.uid() && *cmd.uid() != getuid())
extras.append(" [setuid " + stringify(*cmd.uid()) + "]");
+ extras.append(" [stdout_pipe " + stringify(stdout_pipe.read_fd()) + ", " + stringify(stdout_pipe.write_fd()) + "]");
+
std::string c(cmd.command());
if ((! cmd.stdout_prefix().empty()) || (! cmd.stderr_prefix().empty()))
@@ -172,8 +174,7 @@ PStreamInBuf::~PStreamInBuf()
{
int fdn(fd), x;
waitpid(child, &x, 0);
- Log::get_instance()->message(ll_debug, lc_no_context,
- "pclose " + stringify(fdn) + " -> " + stringify(x));
+ Log::get_instance()->message(ll_debug, lc_no_context, "close " + stringify(fdn) + " -> " + stringify(x));
}
}
@@ -185,8 +186,8 @@ PStreamInBuf::exit_status()
int fdn(fd);
waitpid(child, &_exit_status, 0);
fd = 0;
- Log::get_instance()->message(ll_debug, lc_no_context,
- "manual pclose " + stringify(fdn) + " -> " + stringify(_exit_status));
+ Log::get_instance()->message(ll_debug, lc_no_context, "close " + stringify(fdn) +
+ " for exit status -> " + stringify(_exit_status));
}
return WIFSIGNALED(_exit_status) ? WTERMSIG(_exit_status) + 128 : WEXITSTATUS(_exit_status);
}