Changeset 83612 in vbox

Timestamp:

Apr 7, 2020 5:17:25 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137025

Message:

Guest Control/VBoxSerivce: Include a timestamp in the logfile format to make logs more unique across multiple runs. bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -2266 +2266 @@
             pszSuffix = strchr(g_szLogFile, '\0');
         size_t cchBase = pszSuffix - g_szLogFile;
+
+        RTTIMESPEC Now;
+        RTTimeNow(&Now);
+        char szTime[64];
+        RTTimeSpecToString(&Now, szTime, sizeof(szTime));
+
+        /* Replace out characters not allowed on Windows platforms, put in by RTTimeSpecToString(). */
+        static const RTUNICP s_uszValidRangePairs[] =
+        {
+            ' ', ' ',
+            '(', ')',
+            '-', '.',
+            '0', '9',
+            'A', 'Z',
+            'a', 'z',
+            '_', '_',
+            0xa0, 0xd7af,
+            '\0'
+        };
+        ssize_t cReplaced = RTStrPurgeComplementSet(szTime, s_uszValidRangePairs, '_' /* chReplacement */);
+        AssertReturn(cReplaced, VERR_INVALID_UTF8_ENCODING);
+
 #ifndef DEBUG
-        RTStrPrintf(szParmLogFile, sizeof(szParmLogFile), "%.*s-%RU32-%s%s",
-                    cchBase, g_szLogFile, pSessionStartupInfo->uSessionID, pSessionStartupInfo->szUser, pszSuffix);
+        RTStrPrintf(szParmLogFile, sizeof(szParmLogFile), "%.*s-%RU32-%s-%s%s",
+                    cchBase, g_szLogFile, pSessionStartupInfo->uSessionID, pSessionStartupInfo->szUser, szTime, pszSuffix);
 #else
-        RTStrPrintf(szParmLogFile, sizeof(szParmLogFile), "%.*s-%RU32-%RU32-%s%s",
+        RTStrPrintf(szParmLogFile, sizeof(szParmLogFile), "%.*s-%RU32-%RU32-%s-%s%s",
                     cchBase, g_szLogFile, pSessionStartupInfo->uSessionID, uCtrlSessionThread,
-                    pSessionStartupInfo->szUser, pszSuffix);
+                    pSessionStartupInfo->szUser, szTime, pszSuffix);
 #endif
         apszArgs[idxArg++] = "--logfile";