Changeset 4306 in vbox

Timestamp:

Aug 23, 2007 10:14:15 AM (17 years ago)

Author:

vboxsync

Message:

Main: Rotate VBox.png[.N] files (that may have been created by the GUI) as well.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7115 +7115 @@
         Utf8Str logFile = Utf8StrFmt ("%s%cVBox.log",
                                       logDir.raw(), RTPATH_DELIMITER);
+        Utf8Str pngFile = Utf8StrFmt ("%s%cVBox.png",
+                                      logDir.raw(), RTPATH_DELIMITER);
 
         /*
@@ -7123 +7125 @@
         for (int i = 2; i >= 0; i--)
         {
-            Utf8Str oldName;
-            if (i > 0)
-                oldName = Utf8StrFmt ("%s.%d", logFile.raw(), i);
-            else
-                oldName = logFile;
-            Utf8Str newName = Utf8StrFmt ("%s.%d", logFile.raw(), i + 1);
-            RTFileRename(oldName.raw(), newName.raw(), RTFILEMOVE_FLAGS_REPLACE);
+            Utf8Str *files[] = { &logFile, &pngFile };
+            Utf8Str oldName, newName;
+
+            for (int j = 0; j < ELEMENTS (files); ++ j)
+            {
+                if (i > 0)
+                    oldName = Utf8StrFmt ("%s.%d", files [j]->raw(), i);
+                else
+                    oldName = *files [j];
+                newName = Utf8StrFmt ("%s.%d", files [j]->raw(), i + 1);
+                /* If the old file doesn't exist, delete the new file (if it
+                 * exists) to provide correct rotation even if the sequence is
+                 * broken */
+                if (RTFileRename (oldName, newName, RTFILEMOVE_FLAGS_REPLACE) ==
+                    VERR_FILE_NOT_FOUND)
+                    RTFileDelete (newName);
+            }
         }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2242 +2242 @@
         if (RTDirExists (logFolder))
         {
-            /* delete all VBox.log[.N] files from the Logs folder
+            /* Delete all VBox.log[.N] files from the Logs folder
              * (this must be in sync with the rotation logic in
-             * Console::powerUpThread()) */
+             * Console::powerUpThread()). Also, delete the VBox.png[.N]
+             * files that may have been created by the GUI. */
             Utf8Str log = Utf8StrFmt ("%s/VBox.log", logFolder.raw());
+            RTFileDelete (log);
+            log = Utf8StrFmt ("%s/VBox.png", logFolder.raw());
             RTFileDelete (log);
             for (int i = 3; i >= 0; i--)
             {
                 log = Utf8StrFmt ("%s/VBox.log.%d", logFolder.raw(), i);
+                RTFileDelete (log);
+                log = Utf8StrFmt ("%s/VBox.png.%d", logFolder.raw(), i);
                 RTFileDelete (log);
             }