Add an in-process, blocking mode for running Arbiter

neo4j · Mar 16, 2016 · a8951e8 · a8951e8
1 parent 0236e9c
commit a8951e8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java b/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java
@@ -21,7 +21,7 @@
 
 public class CommunityEntryPoint
 {
-    private static BlockingBootstrapper bootstrapper;
+    private static Bootstrapper bootstrapper;
 
     public static void main( String[] args )
     {

diff --git a/...rprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterEntryPoint.java b/...rprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterEntryPoint.java
@@ -22,10 +22,15 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.neo4j.server.BlockingBootstrapper;
+import org.neo4j.server.Bootstrapper;
+import org.neo4j.server.ServerBootstrapper;
 import org.neo4j.server.configuration.ServerSettings;
 
 public class ArbiterEntryPoint
 {
+    private static Bootstrapper bootstrapper;
+
     public static void main( String[] args ) throws IOException
     {
         int status = new ArbiterBootstrapper().start( getConfigFile() );
@@ -35,6 +40,20 @@ public static void main( String[] args ) throws IOException
         }
     }
 
+    public static void start( String[] args )
+    {
+        bootstrapper = new BlockingBootstrapper( new ArbiterBootstrapper() );
+        System.exit( ServerBootstrapper.start( bootstrapper, args ) );
+    }
+
+    public static void stop( @SuppressWarnings("UnusedParameters") String[] args )
+    {
+        if ( bootstrapper != null )
+        {
+            bootstrapper.stop();
+        }
+    }
+
     static File getConfigFile()
     {
         String configPath = System.getProperty( ServerSettings.SERVER_CONFIG_FILE_KEY );

diff --git a/...ise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java b/...ise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java
@@ -20,11 +20,12 @@
 package org.neo4j.server.enterprise;
 
 import org.neo4j.server.BlockingBootstrapper;
+import org.neo4j.server.Bootstrapper;
 import org.neo4j.server.ServerBootstrapper;
 
 public class EnterpriseEntryPoint
 {
-    private static BlockingBootstrapper bootstrapper;
+    private static Bootstrapper bootstrapper;
 
     public static void main( String[] args )
     {