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

Discard return value and keep retrying

Browse Source
This commit is contained in:
Mygod
2018-10-25 13:44:47 +08:00
parent 8ec83f683f
commit ac9bf38147
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
View File

@@ -1,6 +1,7 @@
package be.mygod.vpnhotspot.net.monitor package be.mygod.vpnhotspot.net.monitor
import be.mygod.vpnhotspot.R import be.mygod.vpnhotspot.R
import be.mygod.vpnhotspot.debugLog
import be.mygod.vpnhotspot.util.thread import be.mygod.vpnhotspot.util.thread
import be.mygod.vpnhotspot.widget.SmartSnackbar import be.mygod.vpnhotspot.widget.SmartSnackbar
import timber.log.Timber import timber.log.Timber
@@ -17,15 +18,17 @@ abstract class IpMonitor : Runnable {
protected abstract fun processLine(line: String) protected abstract fun processLine(line: String)
protected abstract fun processLines(lines: Sequence<String>) protected abstract fun processLines(lines: Sequence<String>)
@Volatile
private var destroyed = false
private var monitor: Process? = null private var monitor: Process? = null
private var pool: ScheduledExecutorService? = null private var pool: ScheduledExecutorService? = null
private fun handleProcess(builder: ProcessBuilder): Boolean { private fun handleProcess(builder: ProcessBuilder) {
val process = try { val process = try {
builder.start() builder.start()
} catch (e: IOException) { } catch (e: IOException) {
Timber.d(e) Timber.d(e)
return false return
} }
monitor = process monitor = process
val err = thread("${javaClass.simpleName}-error") { val err = thread("${javaClass.simpleName}-error") {
@@ -42,17 +45,16 @@ abstract class IpMonitor : Runnable {
} }
err.join() err.join()
process.waitFor() process.waitFor()
val result = process.exitValue() debugLog("IpMonitor", "Monitor process exited with ${process.exitValue()}")
val success = result == 0 || result == 143 // SIGTERM
if (!success) Timber.e("Monitor process exited with $result")
return success
} }
init { init {
thread("${javaClass.simpleName}-input") { thread("${javaClass.simpleName}-input") {
// monitor may get rejected by SELinux // monitor may get rejected by SELinux
if (handleProcess(ProcessBuilder("ip", "monitor", monitoredObject))) return@thread handleProcess(ProcessBuilder("ip", "monitor", monitoredObject))
if (handleProcess(ProcessBuilder("su", "-c", "exec ip monitor $monitoredObject"))) return@thread if (destroyed) return@thread
handleProcess(ProcessBuilder("su", "-c", "exec ip monitor $monitoredObject"))
if (destroyed) return@thread
Timber.w("Failed to set up monitor, switching to polling") Timber.w("Failed to set up monitor, switching to polling")
Timber.i(MonitorFailure()) Timber.i(MonitorFailure())
val pool = Executors.newScheduledThreadPool(1) val pool = Executors.newScheduledThreadPool(1)
@@ -80,6 +82,7 @@ abstract class IpMonitor : Runnable {
} }
fun destroy() { fun destroy() {
destroyed = true
val monitor = monitor val monitor = monitor
if (monitor != null) thread("${javaClass.simpleName}-killer") { monitor.destroy() } if (monitor != null) thread("${javaClass.simpleName}-killer") { monitor.destroy() }
pool?.shutdown() pool?.shutdown()