fix: add missing timecondition during init process

[gigi.git] / util-testing / club / wpia / gigi / DevelLauncher.java

diff --git a/util-testing/club/wpia/gigi/DevelLauncher.java b/util-testing/club/wpia/gigi/DevelLauncher.java
index 69a47ec4e49231098341731959f90a26624aa2ba..9789637a6b7c3fa8e6548fb119cf3e8c58907c3b 100644 (file)
--- a/util-testing/club/wpia/gigi/DevelLauncher.java
+++ b/util-testing/club/wpia/gigi/DevelLauncher.java
@@ -41,6 +41,7 @@ import club.wpia.gigi.pages.account.certs.CertificateRequest;
 import club.wpia.gigi.pages.main.RegisterPage;
 import club.wpia.gigi.util.AuthorizationContext;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class DevelLauncher {
 
@@ -83,7 +84,7 @@ public class DevelLauncher {
                 }
                 try {
                     if ( !ticketUsed) {
-                        Desktop.getDesktop().browse(new URL("http://" + ServerConstants.getWwwHostNamePort() + "/ticketWait").toURI());
+                        Desktop.getDesktop().browse(new URL("http://" + ServerConstants.getHostNamePort(Host.WWW) + "/ticketWait").toURI());
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -93,7 +94,7 @@ public class DevelLauncher {
             }
         }.start();
         BufferedReader br = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
-        System.out.println("Cacert-gigi system sucessfully started.");
+        System.out.println("Gigi system sucessfully started.");
         System.out.println("Press enter to shutdown.");
         br.readLine();
         System.exit(0);
@@ -102,7 +103,7 @@ public class DevelLauncher {
     private static void killPreviousInstance(Properties mainProps) {
         try {
             String targetPort = mainProps.getProperty("http.port");
-            String targetHost = mainProps.getProperty("name.www");
+            String targetHost = mainProps.getProperty("name.www", "www." + mainProps.getProperty("name.suffix"));
             URL u = new URL("http://" + targetHost + ":" + targetPort + "/kill");
             u.openStream();
         } catch (IOException e) {