brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log errors from su

Browse Source
This commit is contained in:
Mygod
2020-07-07 03:24:18 +08:00
parent 2e0b0140ef
commit 513e01d747
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
View File

@@ -191,6 +191,13 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
future.completeExceptionally(e) future.completeExceptionally(e)
return@async return@async
} }
val errorReader = async(Dispatchers.IO) {
try {
process.errorStream.bufferedReader().useLines { seq ->
for (line in seq) warnLogger(line)
}
} catch (_: IOException) { }
}
try { try {
callbackSpin() callbackSpin()
if (active) throw RemoteException("Root process exited unexpectedly") if (active) throw RemoteException("Root process exited unexpectedly")
@@ -199,10 +206,10 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
throw e throw e
} finally { } finally {
if (DEBUG) Log.d(TAG, "Waiting for exit") if (DEBUG) Log.d(TAG, "Waiting for exit")
errorReader.await()
process.waitFor() process.waitFor()
withContext(NonCancellable) { closeInternal(true) } withContext(NonCancellable) { closeInternal(true) }
} }
check(process.errorStream.available() == 0) // stderr should not be used
} }
future.await() future.await()
} }