- Multithreading fix

- Include bash so the startup script works in alpine.

Author: dcshock

Dockerfile

@@ -4,11 +4,14 @@ MAINTAINER Matt Conroy <elduderino@mailinator.com>
 # Install java 8
 RUN apk add --no-cache openjdk8
 
+# Install bash so that the server can actually run.
+RUN apk add --no-cache bash
+
 # Add forklift server
 WORKDIR /tmp
-ADD server/target/universal/forklift-server-0.24.zip forklift.zip
+ADD server/target/universal/forklift-server-0.25.zip forklift.zip
 RUN yes | unzip -d /usr/local forklift.zip
-RUN ln -s /usr/local/forklift-server-0.24 /usr/local/forklift
+RUN ln -s /usr/local/forklift-server-0.25 /usr/local/forklift
 RUN rm forklift.zip
 RUN mkdir -p /usr/local/forklift/consumers
 

README.adoc

@@ -9,6 +9,10 @@ full documentation.
 link:doc/forklift.adoc[Documentation]
 
 == Releases
+* 0.25
+** Fix multithreading that didn't scale past two threads.
+** Include bash in the alpine based docker container so work arounds aren't necessary to start the system.
+
 * 0.24
 ** Synchronous producers
 

core/build.sbt

@@ -2,7 +2,7 @@ organization := "com.github.dcshock"
 
 name := "forklift"
 
-version := "0.18"
+version := "0.19"
 
 // target and Xlint cause sbt dist to fail
 javacOptions ++= Seq("-source", "1.8")//, "-target", "1.8", "-Xlint")

core/src/main/java/forklift/consumer/Consumer.java

@@ -190,7 +190,7 @@ else if (queue != null)
                 log.info("Creating thread pool of {}", multiThreaded.value());
                 blockQueue = new ArrayBlockingQueue<Runnable>(multiThreaded.value() * 100 + 100);
                 threadPool = new ThreadPoolExecutor(
-                    Math.min(2, multiThreaded.value()), multiThreaded.value(), 5L, TimeUnit.MINUTES, blockQueue);
+                    multiThreaded.value(), multiThreaded.value(), 5L, TimeUnit.MINUTES, blockQueue);
                 threadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
             } else {
                 blockQueue = null;

server/build.sbt

@@ -2,7 +2,7 @@ organization := "com.github.dcshock"
 
 name := "forklift-server"
 
-version := "0.24"
+version := "0.25"
 
 enablePlugins(JavaAppPackaging)
 
@@ -15,7 +15,7 @@ initialize := {
 }
 
 libraryDependencies ++= Seq(
-  "com.github.dcshock" % "forklift"           % "0.18",
+  "com.github.dcshock" % "forklift"           % "0.19",
   "com.github.dcshock" % "forklift-activemq"  % "0.9",
   "com.github.dcshock" % "forklift-replay"    % "0.8",
   "com.github.dcshock" % "forklift-retry"     % "0.10",