Create MainLoop thread through a thread factory

Environments such as GAE can provide their own
factories that use, say, custom restricted
thread managers.

Author: michaelklishin

src/com/rabbitmq/client/ThreadFactory.java

@@ -0,0 +1,20 @@
+package com.rabbitmq.client;
+
+/**
+ * Extends {@link java.util.concurrent.ThreadFactory} to make it possible to specify
+ * thread name.
+ *
+ * In environments with restricted thread management (e.g. Google App Engine), developers
+ * can provide a custom factory to control how network I/O thread is created.
+ */
+public interface ThreadFactory extends java.util.concurrent.ThreadFactory {
+    /**
+     * Like {@link java.util.concurrent.ThreadFactory#newThread(Runnable)} but also takes
+     * a thread name.
+     *
+     * @param r runnable to execute
+     * @param threadName thread name
+     * @return a new thread
+     */
+    Thread newThread(Runnable r, String threadName);
+}

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -45,6 +45,7 @@
 import com.rabbitmq.client.SaslConfig;
 import com.rabbitmq.client.SaslMechanism;
 import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.ThreadFactory;
 import com.rabbitmq.client.impl.AMQChannel.BlockingRpcContinuation;
 import com.rabbitmq.utility.BlockingCell;
 
@@ -63,6 +64,7 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
     /** Timeout used while waiting for AMQP handshaking to complete (milliseconds) */
     public static final int HANDSHAKE_TIMEOUT = 10000;
     private Thread mainLoopThread;
+    private ThreadFactory threadFactory = new DefaultThreadFactory();
 
     /**
      * Retrieve a copy of the default table of client properties that
@@ -313,7 +315,7 @@ public void start()
 
         // start the main loop going
         MainLoop loop = new MainLoop();
-        mainLoopThread = new Thread(loop, "AMQP Connection " + getHostAddress() + ":" + getPort());
+        mainLoopThread = threadFactory.newThread(loop, "AMQP Connection " + getHostAddress() + ":" + getPort());
         mainLoopThread.start();
         // after this point clear-up of MainLoop is triggered by closing the frameHandler.
 
@@ -473,6 +475,16 @@ public void setHeartbeat(int heartbeat) {
         }
     }
 
+    /**
+     * Makes it possible to override thread factory that is used
+     * to instantiate connection network I/O loop. Only necessary
+     * in the environments with restricted
+     * @param threadFactory
+     */
+    public void setThreadFactory(ThreadFactory threadFactory) {
+        this.threadFactory = threadFactory;
+    }
+
     public Map<String, Object> getClientProperties() {
         return new HashMap<String, Object>(_clientProperties);
     }

src/com/rabbitmq/client/impl/DefaultThreadFactory.java

@@ -0,0 +1,18 @@
+package com.rabbitmq.client.impl;
+
+import com.rabbitmq.client.ThreadFactory;
+
+/**
+ * Default thread factory that instantiates {@link java.lang.Thread}s directly.
+ */
+public class DefaultThreadFactory implements ThreadFactory {
+    @Override
+    public Thread newThread(Runnable r, String threadName) {
+        return new Thread(r, threadName);
+    }
+
+    @Override
+    public Thread newThread(Runnable r) {
+        return new Thread(r);
+    }
+}