Changeset 39200 in vbox

Timestamp:

Nov 4, 2011 10:35:06 AM (13 years ago)

Author:

vboxsync

Message:

Main/Machine: introduce env variable which allow specifying a different base directory for VM logs

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -6472 +6472 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    aLogFolder = mData->m_strConfigFileFull;    // path/to/machinesfolder/vmname/vmname.vbox
-    aLogFolder.stripFilename();                 // path/to/machinesfolder/vmname
-    aLogFolder.append(RTPATH_DELIMITER);
-    aLogFolder.append("Logs");                  // path/to/machinesfolder/vmname/Logs
+    char szTmp[RTPATH_MAX];
+    int vrc = RTEnvGetEx(RTENV_DEFAULT, "VBOX_USER_VMLOGDIR", szTmp, sizeof(szTmp), NULL);
+    if (RT_SUCCESS(vrc))
+    {
+        if (szTmp[0] && !mUserData.isNull())
+        {
+            char szTmp2[RTPATH_MAX];
+            vrc = RTPathAbs(szTmp, szTmp2, sizeof(szTmp2));
+            if (RT_SUCCESS(vrc))
+                aLogFolder = BstrFmt("%s%c%s",
+                                     szTmp2,
+                                     RTPATH_DELIMITER,
+                                     mUserData->s.strName.c_str()); // path/to/logfolder/vmname
+        }
+        else
+            vrc = VERR_PATH_IS_RELATIVE;
+    }
+
+    if (RT_FAILURE(vrc))
+    {
+        // fallback if VBOX_USER_LOGHOME is not set or invalid
+        aLogFolder = mData->m_strConfigFileFull;    // path/to/machinesfolder/vmname/vmname.vbox
+        aLogFolder.stripFilename();                 // path/to/machinesfolder/vmname
+        aLogFolder.append(RTPATH_DELIMITER);
+        aLogFolder.append("Logs");                  // path/to/machinesfolder/vmname/Logs
+    }
 }