erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Close the socket.

Browse source
This commit is contained in:
Cedric Beust 2016-04-28 05:21:59 -08:00
parent f79d9f9497
commit e6a2ad98f7
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt
View file

@ -5,9 +5,10 @@ import java.io.PrintWriter
import java.net.Socket import java.net.Socket
fun main(argv: Array<String>) { fun main(argv: Array<String>) {
val socket = Socket("localhost", 1234) Socket("localhost", 1234).use { socket ->
(PrintWriter(socket.outputStream, true)).use { out -> (PrintWriter(socket.outputStream, true)).use { out ->
out.println("""{ "name" : "getDependencies", "buildFile": out.println("""{ "name" : "getDependencies", "buildFile":
"/Users/beust/kotlin/kobalt/kobalt/src/${Constants.BUILD_FILE_NAME}"}""") "/Users/beust/kotlin/kobalt/kobalt/src/${Constants.BUILD_FILE_NAME}"}""")
}
} }
} }

25
src/main/kotlin/com/beust/kobalt/app/remote/KobaltClient.kt
View file

@ -112,18 +112,19 @@ class ServerProcess {
} }
try { try {
val socket = Socket("localhost", result) Socket("localhost", result).use { socket ->
val outgoing = PrintWriter(socket.outputStream, true) val outgoing = PrintWriter(socket.outputStream, true)
val c: String = """{ "name": "ping"}""" val c: String = """{ "name": "ping"}"""
outgoing.println(c) outgoing.println(c)
val ins = BufferedReader(InputStreamReader(socket.inputStream)) val ins = BufferedReader(InputStreamReader(socket.inputStream))
var line = ins.readLine() var line = ins.readLine()
val jo = JsonParser().parse(line) as JsonObject val jo = JsonParser().parse(line) as JsonObject
val jsonData = jo["data"]?.asString val jsonData = jo["data"]?.asString
val dataObject = JsonParser().parse(jsonData) as JsonObject val dataObject = JsonParser().parse(jsonData) as JsonObject
val received = JsonParser().parse(dataObject["received"].asString) as JsonObject val received = JsonParser().parse(dataObject["received"].asString) as JsonObject
if (received["name"].asString == "ping") { if (received["name"].asString == "ping") {
result = properties.getProperty(KEY_PORT).toInt() result = properties.getProperty(KEY_PORT).toInt()
}
} }
} catch(ex: IOException) { } catch(ex: IOException) {
log(1, "Couldn't connect to current server, launching a new one") log(1, "Couldn't connect to current server, launching a new one")