Commit ebfd0848 authored by Mygod's avatar Mygod Committed by Max Lv

Fix GuardedProcessPool not handling crashes

parent c3c92b86
...@@ -395,6 +395,7 @@ object BaseService { ...@@ -395,6 +395,7 @@ object BaseService {
// Clean up // Clean up
killProcesses() killProcesses()
// it's hard to resolve DNS on a specific interface so we'll do it here
if (!profile.host.isNumericAddress()) { if (!profile.host.isNumericAddress()) {
thread("BaseService-resolve") { thread("BaseService-resolve") {
profile.host = InetAddress.getByName(profile.host).hostAddress ?: "" profile.host = InetAddress.getByName(profile.host).hostAddress ?: ""
......
...@@ -79,6 +79,7 @@ class GuardedProcessPool { ...@@ -79,6 +79,7 @@ class GuardedProcessPool {
if (SystemClock.elapsedRealtime() - startTime < 1000) { if (SystemClock.elapsedRealtime() - startTime < 1000) {
Crashlytics.log(Log.WARN, TAG, "process exit too fast, stop guard: $cmdName") Crashlytics.log(Log.WARN, TAG, "process exit too fast, stop guard: $cmdName")
break
} }
} }
} catch (_: InterruptedException) { } catch (_: InterruptedException) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment