[systemd-commits] 2 commits - src/core src/journal

[Lennart Poettering]

 src/core/execute.c     |    4 +++-
 src/journal/journald.c |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5ad661b6b05698f8cdb62c1191195b07c68db0f6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 22 19:26:51 2012 +0200

    journal: log journal internal messages to kmsg

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 547c4ec..232457a 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -2774,7 +2774,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_CONSOLE);
+        log_set_target(LOG_TARGET_KMSG);
         log_set_facility(LOG_SYSLOG);
         log_parse_environment();
         log_open();

commit e6a2674500dd4fa0b5eaa93ab77502ba14688c08
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 22 19:26:13 2012 +0200

    execute: use a much lower idle timeout that default time
    
    The idle timeout after all is for cosmetics only, hence avoid any
    substantial delays just for it.

diff --git a/src/core/execute.c b/src/core/execute.c
index 4d40919..4aed4f6 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -61,6 +61,8 @@
 #include "loopback-setup.h"
 #include "path-util.h"
 
+#define IDLE_TIMEOUT_USEC (1*USEC_PER_SEC)
+
 /* This assumes there is a 'tty' group */
 #define TTY_MODE 0620
 
@@ -1065,7 +1067,7 @@ int exec_spawn(ExecCommand *command,
                         if (idle_pipe[1] >= 0)
                                 close_nointr_nofail(idle_pipe[1]);
                         if (idle_pipe[0] >= 0) {
-                                fd_wait_for_event(idle_pipe[0], POLLHUP, DEFAULT_TIMEOUT_USEC);
+                                fd_wait_for_event(idle_pipe[0], POLLHUP, IDLE_TIMEOUT_USEC);
                                 close_nointr_nofail(idle_pipe[0]);
                         }
                 }