erik/kobalt-versioneye
erik/kobalt-versioneye
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added http logging in debug mode.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-04-19 17:03:41 -07:00
parent 3a00c8bc1d
commit fb29ebc536
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kobalt/src/Build.kt
View file

@ -1,10 +1,14 @@
import com.beust.kobalt.*
import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.packaging.assemble
import com.beust.kobalt.plugin.publish.autoGitTag import com.beust.kobalt.plugin.publish.autoGitTag
import com.beust.kobalt.plugin.publish.bintray import com.beust.kobalt.plugin.publish.bintray
import com.beust.kobalt.profile
import com.beust.kobalt.project
import org.apache.maven.model.* import org.apache.maven.model.*
val bs = buildScript {
plugins("net.thauvin.erik:kobalt-maven-local:")
repos(localMaven())
}
val dev by profile() val dev by profile()
val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api" val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api"
@ -36,6 +40,7 @@ val p = project {
dependencies { dependencies {
compile("com.beust:$kobaltDependency:") compile("com.beust:$kobaltDependency:")
compile("com.squareup.okhttp3:logging-interceptor:jar:3.6.0")
} }
dependenciesTest { dependenciesTest {

22
src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt
View file

@ -42,6 +42,7 @@ import com.google.gson.JsonObject
import com.google.inject.Inject import com.google.inject.Inject
import com.google.inject.Singleton import com.google.inject.Singleton
import okhttp3.* import okhttp3.*
import okhttp3.logging.HttpLoggingInterceptor
import java.io.FileOutputStream import java.io.FileOutputStream
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Paths import java.nio.file.Paths
@ -58,7 +59,15 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
private val QUIET_PROPERTY = "ve.quiet" private val QUIET_PROPERTY = "ve.quiet"
private val debug = System.getProperty("ve.debug", "false").toBoolean() private val debug = System.getProperty("ve.debug", "false").toBoolean()
private val httpClient = OkHttpClient() private val fiddler = System.getProperty("ve.fiddler", "false").toBoolean()
private val httpClient = if (!debug) {
OkHttpClient()
} else {
OkHttpClient().newBuilder().addInterceptor(
HttpLoggingInterceptor({ message -> log(2, "[HTTP] $message") })
.apply { level = HttpLoggingInterceptor.Level.BODY }).build()
}
// ITaskContributor // ITaskContributor
override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks
@ -77,12 +86,13 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
@Task(name = "versionEye", description = "Update and check dependencies on VersionEye") @Task(name = "versionEye", description = "Update and check dependencies on VersionEye")
fun versionEye(project: Project): TaskResult { fun versionEye(project: Project): TaskResult {
if (debug) { if (fiddler) {
log(1, " Using Fiddler proxy 127.0.0.1:9898") val port = 9898
log(1, " Using Fiddler proxy 127.0.0.1:$port")
System.setProperty("http.proxyHost", "127.0.0.1") System.setProperty("http.proxyHost", "127.0.0.1")
System.setProperty("https.proxyHost", "127.0.0.1") System.setProperty("https.proxyHost", "127.0.0.1")
System.setProperty("http.proxyPort", "9898") System.setProperty("http.proxyPort", "$port")
System.setProperty("https.proxyPort", "9898") System.setProperty("https.proxyPort", "$port")
} }
val local = "${project.directory}/local.properties" val local = "${project.directory}/local.properties"
@ -205,7 +215,7 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
.post(requestBody.build()) .post(requestBody.build())
.build() .build()
// Execute and handle request // Execute and handle reques
val response = httpClient.newCall(request).execute() val response = httpClient.newCall(request).execute()
if (!response.isSuccessful) { if (!response.isSuccessful) {
warn("Unexpected response from VersionEye: $response") warn("Unexpected response from VersionEye: $response")