Index: /trunk/src/VBox/Main/webservice/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/webservice/Makefile.kmk (revision 35558) +++ /trunk/src/VBox/Main/webservice/Makefile.kmk (revision 35559) @@ -290,4 +290,8 @@ $(VBOXWEB_OUT_DIR)/methodmaps.cpp \ $(VBOXWEB_OUT_DIR)/soapServer.cpp + + vboxweb.cpp_DEFS = \ + VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \ + $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",) vboxwebsrv_ORDERDEPS = $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts Index: /trunk/src/VBox/Main/webservice/vboxweb.cpp =================================================================== --- /trunk/src/VBox/Main/webservice/vboxweb.cpp (revision 35558) +++ /trunk/src/VBox/Main/webservice/vboxweb.cpp (revision 35559) @@ -29,4 +29,6 @@ #include #include + +#include #include @@ -42,4 +44,6 @@ #include #include +#include +#include // workaround for compile problems on gcc 4.1 @@ -107,4 +111,5 @@ bool g_fVerbose = false; // be verbose +bool g_fStdOutLogging = true; // log to stdout PRTSTREAM g_pStrmLog = NULL; @@ -261,5 +266,5 @@ const struct soap *soap) : m_u(u), - m_strThread(com::Utf8StrFmt("SoapQWrk%02d", m_u)), + m_strThread(com::Utf8StrFmt("SQW%02d", m_u)), m_pQ(&q) { @@ -566,39 +571,46 @@ va_end(args); - const char *pcszPrefix = "[ ]"; - util::AutoReadLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS); - ThreadsMap::iterator it = g_mapThreads.find(RTThreadSelf()); - if (it != g_mapThreads.end()) - pcszPrefix = it->second.c_str(); - thrLock.release(); - - // make a timestamp - RTTIMESPEC ts; - RTTimeLocalNow(&ts); - RTTIME t; - RTTimeExplode(&t, &ts); - - com::Utf8StrFmt strPrefix("%04d-%02d-%02d %02d:%02d:%02d %s", - t.i32Year, t.u8Month, t.u8MonthDay, - t.u8Hour, t.u8Minute, t.u8Second, - pcszPrefix); - - // synchronize the actual output - util::AutoWriteLock logLock(g_pWebLogLockHandle COMMA_LOCKVAL_SRC_POS); - // terminal - RTPrintf("%s %s", strPrefix.c_str(), psz); - - // log file - if (g_pStrmLog) - { - RTStrmPrintf(g_pStrmLog, "%s %s", strPrefix.c_str(), psz); - RTStrmFlush(g_pStrmLog); - } + if (g_fStdOutLogging || g_pStrmLog) + { + const char *pcszPrefix = "[ ]"; + util::AutoReadLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS); + ThreadsMap::iterator it = g_mapThreads.find(RTThreadSelf()); + if (it != g_mapThreads.end()) + pcszPrefix = it->second.c_str(); + thrLock.release(); + + // make a timestamp + RTTIMESPEC ts; + RTTimeLocalNow(&ts); + RTTIME t; + RTTimeExplode(&t, &ts); + + com::Utf8StrFmt strPrefix("%04d-%02d-%02d %02d:%02d:%02d %s", + t.i32Year, t.u8Month, t.u8MonthDay, + t.u8Hour, t.u8Minute, t.u8Second, + pcszPrefix); + + // synchronize the actual output + util::AutoWriteLock logLock(g_pWebLogLockHandle COMMA_LOCKVAL_SRC_POS); + // terminal + if (g_fStdOutLogging) + RTPrintf("%s %s", strPrefix.c_str(), psz); + + // log file + if (g_pStrmLog) + { + RTStrmPrintf(g_pStrmLog, "%s %s", strPrefix.c_str(), psz); + RTStrmFlush(g_pStrmLog); + } #ifdef DEBUG - // logger instance - RTLogLoggerEx(LOG_INSTANCE, RTLOGGRPFLAGS_DJ, LOG_GROUP, "%s %s", pcszPrefix, psz); + // debug logger instance + RTLogLoggerEx(LOG_INSTANCE, RTLOGGRPFLAGS_DJ, LOG_GROUP, "%s %s", pcszPrefix, psz); #endif - logLock.release(); + + logLock.release(); + } + + LogRel(("%s", psz)); RTStrFree(psz); @@ -799,7 +811,82 @@ if (g_fDaemonize) { + /* prepare release logging */ + char szLogFile[RTPATH_MAX]; + + rc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile)); + if (RT_FAILURE(rc)) + return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not get base directory for logging: %Rrc", rc); + rc = RTPathAppend(szLogFile, sizeof(szLogFile), "vboxwebsrv.log"); + if (RT_FAILURE(rc)) + return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not construct logging path: %Rrc", rc); + rc = RTProcDaemonizeUsingFork(false /* fNoChDir */, false /* fNoClose */, pszPidFile); if (RT_FAILURE(rc)) return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to daemonize, rc=%Rrc. exiting.", rc); + + /* From now on it's a waste of CPU cycles to send logging to stdout. */ + g_fStdOutLogging = false; + + /* create release logger */ + PRTLOGGER loggerRelease; + static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES; + RTUINT fFlags = RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG; +#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) + fFlags |= RTLOGFLAGS_USECRLF; +#endif + char szError[RTPATH_MAX + 128] = ""; + int vrc = RTLogCreateEx(&loggerRelease, fFlags, "all", + "VBOXWEBSRV_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups, + RTLOGDEST_FILE, szError, sizeof(szError), szLogFile); + if (RT_SUCCESS(vrc)) + { + /* some introductory information */ + RTTIMESPEC timeSpec; + char szTmp[256]; + RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp)); + RTLogRelLogger(loggerRelease, 0, ~0U, + "VirtualBox web service %s r%u %s (%s %s) release log\n" +#ifdef VBOX_BLEEDING_EDGE + "EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n" +#endif + "Log opened %s\n", + VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, + __DATE__, __TIME__, szTmp); + + vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); + if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) + RTLogRelLogger(loggerRelease, 0, ~0U, "OS Product: %s\n", szTmp); + vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp)); + if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) + RTLogRelLogger(loggerRelease, 0, ~0U, "OS Release: %s\n", szTmp); + vrc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szTmp, sizeof(szTmp)); + if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) + RTLogRelLogger(loggerRelease, 0, ~0U, "OS Version: %s\n", szTmp); + if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) + RTLogRelLogger(loggerRelease, 0, ~0U, "OS Service Pack: %s\n", szTmp); + + /* the package type is interesting for Linux distributions */ + char szExecName[RTPATH_MAX]; + char *pszExecName = RTProcGetExecutablePath(szExecName, sizeof(szExecName)); + RTLogRelLogger(loggerRelease, 0, ~0U, + "Executable: %s\n" + "Process ID: %u\n" + "Package type: %s" +#ifdef VBOX_OSE + " (OSE)" +#endif + "\n", + pszExecName ? pszExecName : "unknown", + RTProcSelf(), + VBOX_PACKAGE_STRING); + + /* register this logger as the release logger */ + RTLogRelSetDefaultInstance(loggerRelease); + + /* Explicitly flush the log in case of VBOXWEBSRV_RELEASE_LOG=buffered. */ + RTLogFlush(loggerRelease); + } + else + return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, vrc); } #endif @@ -857,5 +944,5 @@ RTTHREADTYPE_MAIN_WORKER, 0, // flags - "SoapQPumper"); + "SQPmp"); if (RT_FAILURE(rc)) return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start SOAP queue pumper thread: %Rrc", rc);