Merge pull request #85 from launchdarkly/arun/proxy-config

Propagate proxy configuration to okhttp client

Author: arun251

build.gradle

@@ -19,7 +19,7 @@ repositories {
 
 allprojects {
     group = 'com.launchdarkly'
-    version = "2.0.8"
+    version = "2.0.9-SNAPSHOT"
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }
@@ -32,7 +32,7 @@ dependencies {
     compile "com.google.guava:guava:19.0"
     compile "joda-time:joda-time:2.9.3"
     compile "org.slf4j:slf4j-api:1.7.21"
-    compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.0.0", changing: true
+    compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.1.0", changing: true
     compile "redis.clients:jedis:2.9.0"
     testCompile "org.easymock:easymock:3.4"
     testCompile 'junit:junit:4.12'

src/main/java/com/launchdarkly/client/StreamProcessor.java

@@ -7,6 +7,8 @@
 import com.launchdarkly.eventsource.MessageEvent;
 import com.launchdarkly.eventsource.ReadyState;
 import okhttp3.Headers;
+
+import org.apache.http.HttpHost;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -124,11 +126,24 @@ public void onError(Throwable throwable) {
       }
     };
 
-    es = new EventSource.Builder(handler, URI.create(config.streamURI.toASCIIString() + "/flags"))
+    EventSource.Builder builder = new EventSource.Builder(handler, URI.create(config.streamURI.toASCIIString() + "/flags"))
         .headers(headers)
-        .reconnectTimeMs(config.reconnectTimeMs)
-        .build();
+        .reconnectTimeMs(config.reconnectTimeMs);
+    if (config.proxyHost != null) {
+        int proxyPort = config.proxyHost.getPort();
+        if (proxyPort == -1) {
+            String scheme = config.proxyHost.getSchemeName();
+            if (scheme == "http")
+                proxyPort = 80;
+            else if (scheme == "https")
+                proxyPort = 443;
+            else
+                logger.error("Unknown proxy scheme: " + scheme);
+        }
+        builder.proxy(config.proxyHost.getHostName(), proxyPort);
+    }
 
+    es = builder.build();
     es.start();
     return initFuture;
   }