Merge branch 'master' into pr/2019

apache · Nov 22, 2022 · e57192f · e57192f
2 parents e47b592 + 7acd496
commit e57192f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/hugegraph-dist/src/assembly/static/bin/hugegraph b/hugegraph-dist/src/assembly/static/bin/hugegraph
@@ -37,9 +37,13 @@
 ### END INIT INFO
 
 # Variables
+# it requires user to set a fixed abs path manually
 INSTALL_DIR=
 SERVER_PORT=
 
+${INSTALL_DIR:?"Please set variables 'INSTALL_DIR'"}
+${SERVER_PORT:?"Please set variables 'SERVER_PORT'"}
+
 BIN_DIR=$INSTALL_DIR/bin
 SERVER_URL="http://localhost:${SERVER_PORT}"
 DETECT_URL="$SERVER_URL/versions"

diff --git a/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGraphServer.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGraphServer.java
@@ -21,6 +21,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.slf4j.Logger;
 
@@ -139,6 +140,7 @@ public static void main(String[] args) throws Exception {
             server.stop();
             LOG.info("HugeGraphServer stopped");
 
+            LogManager.shutdown();
             serverStopped.complete(null);
         }, "hugegraph-server-shutdown"));
         // Wait for server-shutdown and server-stopped

diff --git a/hugegraph-style.xml b/hugegraph-style.xml
@@ -16,9 +16,9 @@
   -->
 <code_scheme name="hugegraph-style" version="173">
   <option name="LINE_SEPARATOR" value="&#xA;" />
-  <option name="RIGHT_MARGIN" value="80" />
+  <option name="RIGHT_MARGIN" value="100" />
   <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
-  <option name="SOFT_MARGINS" value="80" />
+  <option name="SOFT_MARGINS" value="100" />
   <JavaCodeStyleSettings>
     <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
     <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />