[wpilib] DataLogManager: Change sim location to logs subdir (#6039)

wpilibsuite · Dec 12, 2023 · d9b504b · d9b504b
1 parent 906b810
commit d9b504b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -232,7 +232,10 @@ static std::string MakeLogDir(std::string_view dir) {
   fs::create_directory("/home/lvuser/logs", ec);
   return "/home/lvuser/logs";
 #else
-  return filesystem::GetOperatingDirectory();
+  std::string logDir = filesystem::GetOperatingDirectory() + "/logs";
+  std::error_code ec;
+  fs::create_directory(logDir, ec);
+  return logDir;
 #endif
 }
 

diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/DataLogManager.cpp
@@ -79,7 +79,10 @@ static std::string MakeLogDir(std::string_view dir) {
   fs::create_directory("/home/lvuser/logs", ec);
   return "/home/lvuser/logs";
 #else
-  return filesystem::GetOperatingDirectory();
+  std::string logDir = filesystem::GetOperatingDirectory() + "/logs";
+  std::error_code ec;
+  fs::create_directory(logDir, ec);
+  return logDir;
 #endif
 }
 

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java
@@ -233,7 +233,11 @@ private static String makeLogDir(String dir) {
       }
       return "/home/lvuser/logs";
     }
-    return Filesystem.getOperatingDirectory().getAbsolutePath();
+    String logDir = Filesystem.getOperatingDirectory().getAbsolutePath() + "/logs";
+    if (!new File(logDir).mkdir()) {
+      // ignored
+    }
+    return logDir;
   }
 
   private static String makeLogFilename(String filenameOverride) {