Merge pull request #354 from tronprotocol/feature/deploy

feat: add travis to deploy.

Author: huzhenyuan

.travis.yml

@@ -9,10 +9,10 @@ script:
 addons:
   ssh_known_hosts:
   - 47.93.9.236:22008
-  - 47.93.33.201:22008
-  - 123.56.10.6:22008
-  - 39.107.80.135:22008
-  - 47.93.184.2:22008
+#  - 47.93.33.201:22008
+#  - 123.56.10.6:22008
+#  - 39.107.80.135:22008
+#  - 47.93.184.2:22008
 skip_build:
 - README.md
 - LICENSE

deploy.sh

@@ -1,7 +1,2 @@
 #!/bin/bash
-./gradlew clean shadowJar
-ssh [email protected] -p 22008 mkdir java-tron
-scp -P 22008 build/libs/java-tron.jar [email protected]:/home/tron/java-tron/
-scp -P 22008 start.sh [email protected]:/home/tron/java-tron/
-# ssh [email protected] -p 22008 sh java-tron/start.sh
-ls -a
+ssh [email protected] -p 22008 sh /home/tron/workspace/deploy_all.sh

src/main/java/org/tron/core/config/Configuration.java

@@ -40,24 +40,21 @@ public static com.typesafe.config.Config getByPath(final String configurationPat
       throw new IllegalArgumentException("Configuration path is required!");
     }
 
-    //if (config == null) {
-
     File confFile = new File(configurationPath);
     if (confFile.exists()) {
-      logger.info("eee");
-      logger.info(configurationPath);
-
       config = ConfigFactory.parseFile(new File(configurationPath));
-      return config;
     } else {
-      logger.info("aaa");
-      logger.info(configurationPath);
       config = ConfigFactory.load(configurationPath);
-      return config;
     }
+    return config;
+  }
+
+  public static com.typesafe.config.Config getByFile(final File confFile) {
+    if (!confFile.exists()) {
+      throw new IllegalArgumentException("Configuration path is required!");
+    }
+    config = ConfigFactory.parseFile(confFile);
+    return config;
   }
-  //logger.info("fff");
-  //logger.info(configurationPath);
-  //return config;
 }
 

src/main/java/org/tron/core/config/args/Args.java

@@ -183,15 +183,14 @@ public static void clearParam() {
   /**
    * set parameters.
    */
-  public static void setParam(final String[] args, final String configFile) {
+  public static void setParam(final String[] args, final String configFilePath) {
     Config config;
-    logger.info(configFile);
     JCommander.newBuilder().addObject(INSTANCE).build().parse(args);
-    if ("" == INSTANCE.confFile) {
-      config = Configuration.getByPath(configFile);
-      logger.info(configFile);
+    File confFile = new File(INSTANCE.confFile);
+    if (confFile.exists()) {
+      config = Configuration.getByFile(confFile);
     } else {
-      config = Configuration.getByPath(INSTANCE.confFile);
+      config = Configuration.getByPath(configFilePath);
     }
     if (StringUtils.isNoneBlank(INSTANCE.privateKey)) {
       INSTANCE.setLocalWitnesses(new LocalWitnesses(INSTANCE.privateKey));

start.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-nohup  java -jar java-tron.jar -c config.conf > tron-shell.log 2>&1 &
+kill -9 `cat /home/tron/pid.txt`
+nohup  java -jar /home/tron/java-tron/java-tron.jar --witness -c /home/tron/config.conf > /home/tron/tron-shell.log 2>&1 & echo $! >/home/tron/pid.txt