[infinispan-commits] Infinispan SVN: r1377 - in trunk/server/memcached/src/main: java/org/infinispan/server/memcached and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-01-15 12:22:22 -0500 (Fri, 15 Jan 2010)
New Revision: 1377

Added:
   trunk/server/memcached/src/main/resources/
   trunk/server/memcached/src/main/resources/memcached.sh
Modified:
   trunk/server/memcached/src/main/java/org/infinispan/server/memcached/Main.java
   trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java
Log:
[ISPN-173] (Build memcached server module) Added a server startup script for linux/unix and fixed startup issues.

Modified: trunk/server/memcached/src/main/java/org/infinispan/server/memcached/Main.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/memcached/Main.java	2010-01-15 17:14:23 UTC (rev 1376)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/memcached/Main.java	2010-01-15 17:22:22 UTC (rev 1377)
@@ -24,6 +24,7 @@
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -37,6 +38,8 @@
 import gnu.getopt.LongOpt;
 
 import org.infinispan.Version;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 
 /**
  * Main.
@@ -46,6 +49,7 @@
  */
 public class Main {
 
+   private static final Log log = LogFactory.getLog(Main.class);
    public static final String PROP_KEY_PORT = "infinispan.memcached.port";
    public static final String PROP_KEY_HOST = "infinispan.memcached.host";
    public static final String PROP_KEY_MASTER_THREADS = "infinispan.memcached.master.threads";
@@ -189,6 +193,7 @@
    }
 
    public static void main(final String[] args) throws Exception {
+      log.info("Start main with args: {0}", Arrays.toString(args));
       Callable<Void> worker = new Callable<Void>() {
          @Override
          public Void call() throws Exception {
@@ -204,14 +209,14 @@
          }
       };
 
-      Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+      Future<Void> f = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
          @Override
          public Thread newThread(Runnable r) {
-            Thread t = new Thread(r, System.getProperty("program.name") + "-main");
-            t.setDaemon(true);
-            return t;
+            return new Thread(r, System.getProperty("program.name") + "-main");
          }
       }).submit(worker);
+
+      f.get();
    }
 
    /**

Modified: trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java	2010-01-15 17:14:23 UTC (rev 1376)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java	2010-01-15 17:22:22 UTC (rev 1377)
@@ -27,7 +27,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.infinispan.Cache;
@@ -98,9 +97,9 @@
    }
 
    public void stop() {
-      masterExecutor.shutdown();
-      workerExecutor.shutdown();
-      bootstrap.stop();
+      if (bootstrap != null) {
+         bootstrap.stop();
+      }
       cache.stop();
       scheduler.shutdown();
    }

Added: trunk/server/memcached/src/main/resources/memcached.sh
===================================================================
--- trunk/server/memcached/src/main/resources/memcached.sh	                        (rev 0)
+++ trunk/server/memcached/src/main/resources/memcached.sh	2010-01-15 17:22:22 UTC (rev 1377)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+DIRNAME=`dirname $0`
+
+# Setup ISPN_HOME
+if [ "x$ISPN_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    ISPN_HOME=`cd $DIRNAME/..; pwd`
+fi
+export ISPN_HOME
+
+CP=${CP}:${ISPN_HOME}/infinispan-core.jar
+
+if [ -e ${ISPN_HOME}/lib ]
+then
+   for JAR in ${ISPN_HOME}/lib/*
+   do
+      CP=$CP:$JAR
+   done
+fi
+
+CP=${CP}:${ISPN_HOME}/modules/memcached/infinispan-server-memcached.jar
+
+if [ -e ${ISPN_HOME}/modules/memcached/lib ]
+then
+   for JAR in ${ISPN_HOME}/modules/memcached/lib/*
+   do
+      CP=$CP:$JAR
+   done
+fi
+
+JVM_PARAMS="${JVM_PARAMS} -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+
+# Sample JPDA settings for remote socket debuging
+#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+
+java -cp $CP ${JVM_PARAMS} org.infinispan.server.memcached.Main ${*}
\ No newline at end of file