Commit 8e126511 authored by Mygod's avatar Mygod

Revert "Remove file socket on thread finishes"

This reverts commit 8c55630e.
parent 8c55630e
...@@ -42,28 +42,24 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() { ...@@ -42,28 +42,24 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
*/ */
protected abstract fun accept(socket: LocalSocket) protected abstract fun accept(socket: LocalSocket)
override fun run() { override fun run() {
while (!socketFile.delete()) Thread.sleep(100)
try { try {
while (!socketFile.delete()) Thread.sleep(100) val localSocket = LocalSocket()
localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
serverSocket.set(LocalServerSocket(localSocket.fileDescriptor))
} catch (e: IOException) {
Log.e(tag, "unable to bind", e)
return
}
while (true) {
val serverSocket = serverSocket.get() ?: return
try { try {
val localSocket = LocalSocket() serverSocket.accept()
localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
serverSocket.set(LocalServerSocket(localSocket.fileDescriptor))
} catch (e: IOException) { } catch (e: IOException) {
Log.e(tag, "unable to bind", e) Log.e(tag, "Error when accept socket", e)
return app.track(e)
} null
while (true) { }?.use(this::accept)
val serverSocket = serverSocket.get() ?: return
try {
serverSocket.accept()
} catch (e: IOException) {
Log.e(tag, "Error when accept socket", e)
app.track(e)
null
}?.use(this::accept)
}
} finally {
stopThread()
} }
} }
...@@ -71,7 +67,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() { ...@@ -71,7 +67,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
val old = serverSocket.getAndSet(null) ?: return val old = serverSocket.getAndSet(null) ?: return
try { try {
old.close() old.close()
if (!socketFile.delete()) socketFile.deleteOnExit()
} catch (_: Exception) { } // ignore } catch (_: Exception) { } // ignore
} }
} }
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