Connection timeout is now configurable

.gitignore

@@ -18,3 +18,4 @@ target/*
 
 # jenv
 .java_version
+.factorypath

src/main/java/org/datadog/jmxfetch/Connection.java

@@ -30,13 +30,13 @@
 @Slf4j
 public class Connection {
     private static final long CONNECTION_TIMEOUT = 10000;
-    private static final long JMX_TIMEOUT = 20;
     public static final String CLOSED_CLIENT_CAUSE = "The client has been closed";
     private static final ThreadFactory daemonThreadFactory = new DaemonThreadFactory();
     private JMXConnector connector;
     protected MBeanServerConnection mbs;
     protected Map<String, Object> env;
     protected JMXServiceURL address;
+    protected long jmx_timeout = 20;
 
     private static <T extends Throwable> T initCause(T wrapper, Throwable wrapped) {
         wrapper.initCause(wrapped);
@@ -108,7 +108,7 @@ public void run() {
                 });
         Object result;
         try {
-            result = mailbox.poll(JMX_TIMEOUT, TimeUnit.SECONDS);
+            result = mailbox.poll(jmx_timeout, TimeUnit.SECONDS);
             if (result == null) {
                 if (!mailbox.offer("")) {
                     result = mailbox.take();

src/main/java/org/datadog/jmxfetch/RemoteConnection.java

@@ -47,6 +47,17 @@ public RemoteConnection(Map<String, Object> connectionParams) throws IOException
             rmiTimeout = DEFAULT_RMI_RESPONSE_TIMEOUT;
         }
 
+        Integer connectionTimeout;
+        try {
+            connectionTimeout = (Integer) connectionParams.get("rmi_connection_timeout");
+        } catch (final ClassCastException e) {
+            connectionTimeout =
+                Integer.parseInt((String) connectionParams.get("rmi_connection_timeout"));
+        }
+        if (connectionTimeout != null) {
+            jmx_timeout = connectionTimeout;
+        }
+
         user = (String) connectionParams.get("user");
         password = (String) connectionParams.get("password");
         jmxUrl = (String) connectionParams.get("jmx_url");