Commit 8e126511 authored by Mygod's avatar Mygod

Revert "Remove file socket on thread finishes"

This reverts commit 8c55630e.
parent 8c55630e
...@@ -42,7 +42,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() { ...@@ -42,7 +42,6 @@ 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() {
try {
while (!socketFile.delete()) Thread.sleep(100) while (!socketFile.delete()) Thread.sleep(100)
try { try {
val localSocket = LocalSocket() val localSocket = LocalSocket()
...@@ -62,16 +61,12 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() { ...@@ -62,16 +61,12 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
null null
}?.use(this::accept) }?.use(this::accept)
} }
} finally {
stopThread()
}
} }
fun stopThread() { fun stopThread() {
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