From 4ab4a86507992d75cdae1cf801b5f16895eb7c0b Mon Sep 17 00:00:00 2001 From: wallentx Date: Sun, 18 Oct 2026 03:56:09 -0500 Subject: [PATCH] Defer abandoned log scrubbing past launch --- .../launcher/session/SessionArtifacts.kt | 2 ++ .../launcher/session/SessionLogShareTest.kt | 32 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index 9027d7dceb..6696b0d18d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -342,6 +342,7 @@ object SessionArtifacts { for (dir in abandoned) { if (stopWhenSessionStarts && SessionState.running) break if (dir == current) continue + if (beforeGuestStart && dir != latestPreviousSession) continue val newest = dir == latestPreviousSession try { val recoveryNote = File(dir, "ended-without-teardown.txt") @@ -415,6 +416,7 @@ object SessionArtifacts { break } SessionEvents.record("session.artifacts_recovered", mapOf("newest" to newest), dir) + if (beforeGuestStart) return val scrubbed = scrubTree(record) { stopWhenSessionStarts && SessionState.running } val marked = markScrubbed(scrubbed) if (scrubbed.deferred) break diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt index 2de76b1482..e10df29a07 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt @@ -258,12 +258,14 @@ class SessionLogShareTest { val marker = File(root, "root/.droiddeck-vac-diagnostics") val launches = File(root, "root/.droiddeck-vac-launches") val runtimeSteamLog = File(SessionPrefs.steamRoot(context, "arm64"), "logs/startup-recovery-vac.log") + val sessionLog = File(folder, "session.log") val previousRunning = SessionState.running val previousPhase = SessionState.phase try { folder.deleteRecursively() folder.mkdirs() SessionArtifacts.recordClient(folder, "arm64") + sessionLog.writeText("$secret\n") marker.apply { parentFile!!.mkdirs(); writeText("0\narm64\n") } launches.writeText("startup VAC evidence\n") runtimeSteamLog.apply { parentFile!!.mkdirs(); writeText("startup VAC evidence\n") } @@ -279,6 +281,14 @@ class SessionLogShareTest { assertEquals("startup VAC evidence\n", File(folder, "steam/startup-recovery-vac.log").readText()) assertTrue(File(folder, "vac.txt").readText().contains("startup VAC evidence")) + assertTrue(File(folder, ".recovery-runtime-captured").isFile) + assertTrue(sessionLog.readText().contains(leaked)) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + + assertFalse(sessionLog.readText().contains(leaked)) assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) } finally { SessionState.running = previousRunning @@ -290,11 +300,12 @@ class SessionLogShareTest { } } - @Test fun startupRecoveryExcludesCurrentFolderAndCompletesDeferredRuntimeCapture() { + @Test fun startupRecoveryExcludesCurrentFolderAndCapturesDeferredRuntime() { val context: android.content.Context = RuntimeEnvironment.getApplication() val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) val logs = com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context) val day = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date()) + val olderFolder = File(logs, "$day-8999-older-recovery") val folder = File(logs, "$day-9000-deferred-recovery") val marker = File(root, "root/.droiddeck-vac-diagnostics") val launches = File(root, "root/.droiddeck-vac-launches") @@ -304,6 +315,8 @@ class SessionLogShareTest { val previousLogsEnabled = SessionPrefs.logsEnabled(context) var currentFolder: File? = null try { + olderFolder.deleteRecursively() + olderFolder.mkdirs() folder.deleteRecursively() folder.mkdirs() SessionArtifacts.recordClient(folder, "arm64") @@ -321,15 +334,25 @@ class SessionLogShareTest { assertEquals("deferred VAC evidence\n", File(folder, "steam/deferred-recovery-vac.log").readText()) assertTrue(File(folder, "vac.txt").readText().contains("deferred VAC evidence")) assertTrue(File(folder, ".recovery-runtime-captured").isFile) - assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + assertFalse(File(olderFolder, "ended-without-teardown.txt").exists()) + assertFalse(File(olderFolder, SessionArtifacts.COMPLETE_MARKER).exists()) assertFalse(File(currentFolder, "ended-without-teardown.txt").exists()) assertFalse(File(currentFolder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + assertTrue(File(olderFolder, SessionArtifacts.COMPLETE_MARKER).isFile) + assertFalse(File(currentFolder, SessionArtifacts.COMPLETE_MARKER).exists()) } finally { SessionState.running = previousRunning SessionState.phase = previousPhase SessionPaths.take()?.let { SessionPaths.release(context, it) } currentFolder?.deleteRecursively() SessionPrefs.setLogsEnabled(context, previousLogsEnabled) + olderFolder.deleteRecursively() folder.deleteRecursively() runtimeSteamLog.delete() marker.delete() @@ -368,6 +391,11 @@ class SessionLogShareTest { assertEquals("session A\n", File(folder, "steam/expired-recovery.log").readText()) assertTrue(File(folder, "ended-without-teardown.txt").readText().contains("runtime capture did not finish")) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) } finally { SessionState.running = previousRunning