completed setup for installation, fixed robustness problem.

[upnpmonitor] / monitor / src / main / java / org / wamblee / upnpmonitor / Main.java

diff --git a/monitor/src/main/java/org/wamblee/upnpmonitor/Main.java b/monitor/src/main/java/org/wamblee/upnpmonitor/Main.java
index 4d49b33a7e115b2ca90de619b1ec82f49c253db9..f982fbc3e743ad450e80c348de6a022d54e1bd7e 100644 (file)
--- a/monitor/src/main/java/org/wamblee/upnpmonitor/Main.java
+++ b/monitor/src/main/java/org/wamblee/upnpmonitor/Main.java
@@ -1,5 +1,9 @@
 package org.wamblee.upnpmonitor;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
 import java.util.logging.Logger;
 
 public class Main {
@@ -8,15 +12,23 @@ public class Main {
 
     public static void main(String[] aArgs) throws Exception {
 
-        Config config = new Config(30, "echo starting", "echo stopping",
-            "mediatomb");
+        String propertyFile = System
+            .getProperty("org.wamblee.upnpmonitor.propertyfile");
+        Properties props = new Properties();
+        InputStream is = new FileInputStream(new File(propertyFile));
+        props.load(is);
+        is.close();
+
+        Config config = Config.parse(props);
+        LOGGER.info("COnfiguration: " + config);
 
         final Monitor monitor = new Monitor(config);
 
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
-                System.out.println("Signal caught, terminating monitor");
+                System.out
+                    .println("Signal caught, terminating monitor and executing shutdown command");
                 monitor.stop();
             }
         });