diff --git a/debian/changelog b/debian/changelog index 8b29581..08ead12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +applauncherd (2.0.15) stable; urgency=low + + * Fixes: NB#295360 - Report extended exit code from applifed/applauncher + + -- Juha Lintula Wed, 21 Dec 2011 12:26:50 +0200 + applauncherd (2.0.14) stable; urgency=low * Fixes: NB#288982 - COREWEB: booster '__assert_fail append_pending_request _XReply' diff --git a/src/launcherlib/daemon.cpp b/src/launcherlib/daemon.cpp index 3cd446d..2af7a19 100644 --- a/src/launcherlib/daemon.cpp +++ b/src/launcherlib/daemon.cpp @@ -535,6 +535,7 @@ void Daemon::reapZombies() if (WIFEXITED(status)) { + Logger::logInfo("Boosted process (pid=%d) exited with status %d\n", pid, WEXITSTATUS(status)); Logger::logDebug("Daemon: child exited by exit(x), _exit(x) or return x\n"); Logger::logDebug("Daemon: x == %d\n", WEXITSTATUS(status)); FdMap::iterator fd = m_boosterPidToInvokerFd.find(pid); @@ -552,6 +553,7 @@ void Daemon::reapZombies() int signal = WTERMSIG(status); pid_t invokerPid = (*it).second; + Logger::logInfo("Boosted process (pid=%d) was terminated due to signal %d\n", pid, signal); Logger::logDebug("Daemon: Booster (pid=%d) was terminated due to signal %d\n", pid, signal); Logger::logDebug("Daemon: Killing invoker process (pid=%d) by signal %d..\n", invokerPid, signal); diff --git a/src/launcherlib/logger.cpp b/src/launcherlib/logger.cpp index e00bd0e..c392f8a 100644 --- a/src/launcherlib/logger.cpp +++ b/src/launcherlib/logger.cpp @@ -83,6 +83,8 @@ void Logger::logInfo(const char * format, ...) va_start(ap, format); writeLog(LOG_INFO, format, ap); va_end(ap); + // To avoid extra file descriptors in forked boosters closing connection to syslog + Logger::closeLog(); } void Logger::logWarning(const char * format, ...)