Changeset 47525 in vbox for trunk/src/VBox

Timestamp:

Aug 2, 2013 5:07:41 PM (11 years ago)

Author:

vboxsync

Message:

control VBoxSVC release logging xtracker id 6787

Location:

trunk/src/VBox/Main

Files:

• include/Logging.h (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/SystemPropertiesImpl.cpp (modified) (3 diffs)
• src-server/win/svcmain.cpp (modified) (1 diff)
• src-server/xpcom/server.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/Logging.h

@@ -41 +41 @@
 # define LOG_GROUP LOG_GROUP_MAIN
 #endif
+#ifndef VBOXSVC_LOG_DEFAULT
+# define VBOXSVC_LOG_DEFAULT "all"
+#endif
 
 #include <VBox/log.h>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -222 +222 @@
     void onNATNetworkChange(IN_BSTR aNetworkName);
     void onNATNetworkStartStop(IN_BSTR aNetworkName, BOOL aStart);
-    void onNATNetworkSetting(IN_BSTR aNetworkName, BOOL aEnabled, IN_BSTR aNetwork, 
-                             IN_BSTR aGateway, BOOL aAdvertiseDefaultIpv6RouteEnabled, 
+    void onNATNetworkSetting(IN_BSTR aNetworkName, BOOL aEnabled, IN_BSTR aNetwork,
+                             IN_BSTR aGateway, BOOL aAdvertiseDefaultIpv6RouteEnabled,
                              BOOL fNeedDhcpServer);
-    void onNATNetworkPortForward(IN_BSTR aNetworkName, BOOL create, BOOL fIpv6, 
-                                 IN_BSTR aRuleName, NATProtocol_T proto, 
-                                 IN_BSTR aHostIp, LONG aHostPort, 
+    void onNATNetworkPortForward(IN_BSTR aNetworkName, BOOL create, BOOL fIpv6,
+                                 IN_BSTR aRuleName, NATProtocol_T proto,
+                                 IN_BSTR aHostIp, LONG aHostPort,
                                  IN_BSTR aGuestIp, LONG aGuestPort);
 

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -655 +655 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->strLoggingLevel.cloneTo(aLoggingLevel);
-
+    Utf8Str useLoggingLevel(m->strLoggingLevel);
+    useLoggingLevel = (useLoggingLevel.isEmpty() ? VBOXSVC_LOG_DEFAULT : useLoggingLevel);
+
+    useLoggingLevel.cloneTo(aLoggingLevel);
     return S_OK;
 }
@@ -674 +676 @@
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
         rc = mParent->saveSettings();
+    }
+    else
+    {
+        LogRel(("Cannot set passed logging level=%s, or the default one - Error=%Rrc \n", aLoggingLevel, rc));
     }
 
@@ -1277 +1283 @@
 HRESULT SystemProperties::setLoggingLevel(const Utf8Str &aLoggingLevel)
 {
-    m->strLoggingLevel = aLoggingLevel;
-    return S_OK;
+    HRESULT rc = S_OK;
+    Utf8Str useLoggingLevel(aLoggingLevel);
+    rc = RTLogGroupSettings(RTLogRelDefaultInstance(), useLoggingLevel.c_str());
+    //  If failed and not the default logging level - try to use the default logging level.
+    if (!SUCCEEDED(rc)){
+        // If failed write message to the release log.
+        LogRel(("Cannot set passed logging level=%s Error=%Rrc \n", useLoggingLevel.c_str(), rc));
+        //  If attempted logging level not the default one then try the default one.
+        if (!useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT)){
+            rc = RTLogGroupSettings(RTLogRelDefaultInstance(), VBOXSVC_LOG_DEFAULT);
+            // If failed report this to the release log.
+            if (!SUCCEEDED(rc))
+                LogRel(("Cannot set default logging level Error=%Rrc \n", rc));
+        }
+        // On any failure - set default level as the one to be stored.
+        useLoggingLevel = VBOXSVC_LOG_DEFAULT;
+    }
+    //  Set to passed value or if default used/attempted (even if error condition) use empty string.
+    m->strLoggingLevel = (useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT) ? "" : useLoggingLevel);
+    return rc;
 }
 

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -347 +347 @@
         vrc = com::VBoxLogRelCreate("COM Server", szLogFile,
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
-                                    "all", "VBOXSVC_RELEASE_LOG",
+                                    VBOXSVC_LOG_DEFAULT, "VBOXSVC_RELEASE_LOG",
                                     RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,
                                     cHistory, uHistoryFileTime, uHistoryFileSize,

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -903 +903 @@
     vrc = com::VBoxLogRelCreate("XPCOM Server", szLogFile,
                                 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
-                                "all", "VBOXSVC_RELEASE_LOG",
+                                VBOXSVC_LOG_DEFAULT, "VBOXSVC_RELEASE_LOG",
                                 RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,
                                 cHistory, uHistoryFileTime, uHistoryFileSize,