Переглянути джерело

fix(jawn): using the provided DBHOST

MTD 10 роки тому
батько
коміт
b51ced14a6

+ 1 - 1
frameworks/Java/jawn/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 /* ****************** */
 run {
     if(project.hasProperty('args')){
-        args project.args.split('\\s')
+        args project.args.split(',')
     }
 }
 applicationDistribution.from("webapp") {

+ 1 - 1
frameworks/Java/jawn/setup.sh

@@ -5,4 +5,4 @@ source $IROOT/java8.installed
 
 ./gradlew clean --daemon
 
-./gradlew run
+./gradlew run -Pargs=production,$DBHOST

+ 2 - 0
frameworks/Java/jawn/src/main/java/app/UndertowMain.java

@@ -12,6 +12,8 @@ public class UndertowMain {
         if (args.length > 0) environment = args[0];
         System.setProperty("JAWN_ENV", environment);
         
+        if (args.length > 1)  System.setProperty("DBHOST", args[1]);
+        
         ServerConfig config = new ServerConfig();
         config.setContextPath("/");
         config.setPort(8081);

+ 6 - 4
frameworks/Java/jawn/src/main/java/app/config/Database.java

@@ -5,7 +5,7 @@ import net.javapla.jawn.core.spi.ApplicationDatabaseBootstrap;
 import net.javapla.jawn.core.util.Modes;
 
 public class Database implements ApplicationDatabaseBootstrap {
-
+    
     @Override
     public void dbConnections(DatabaseConnections connections) {
         
@@ -25,12 +25,15 @@ public class Database implements ApplicationDatabaseBootstrap {
                 "&useServerPrepStmts" +
                 "&cacheRSMetadata=true";
         
+        String host = System.getProperty("DBHOST", "localhost");
+        String dbUrl = "jdbc:mysql://"+host+"/hello_world?";
+        
+        
         connections
             .environment(Modes.prod)
             .jdbc()
             .driver("com.mysql.jdbc.Driver")
-            .url("jdbc:mysql://localhost/hello_world?" + jdbcParams)
-//            .url("jdbc:mysql://192.168.100.11/hello_world?" + jdbcParams)
+            .url(dbUrl + jdbcParams)
             .user("benchmarkdbuser")
             .password("benchmarkdbpass")
             .maxPoolSize(256)
@@ -40,7 +43,6 @@ public class Database implements ApplicationDatabaseBootstrap {
             .environment(Modes.dev)
             .jdbc()
             .driver("com.mysql.jdbc.Driver")
-//            .url("jdbc:mysql://localhost/hello_world?" + jdbcParams)
             .url("jdbc:mysql://192.168.100.11/hello_world?" + jdbcParams)
             .user("benchmarkdbuser")
             .password("benchmarkdbpass");