From 8cd81766a044857906e590bc9b2906d4c2cdbc9f Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Mon, 7 Dec 2015 21:20:47 +0100
Subject: [PATCH] Added conf file for configuring server ports

Former-commit-id: 16f48cef9ddfdf3722bff863eb520e807d7c0c37
---
 hal.conf                                      |  2 +
 src/se/koc/hal/HalContext.java                | 38 ++++++++++++++++---
 src/se/koc/hal/PowerChallenge.java            |  5 +--
 .../hal/deamon/DataSynchronizationDaemon.java |  3 +-
 src/se/koc/hal/page/PCConfigureHttpPage.java  |  0
 src/se/koc/hal/page/PCHeatMapHttpPage.java    |  0
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100755 hal.conf
 mode change 100644 => 100755 src/se/koc/hal/HalContext.java
 mode change 100644 => 100755 src/se/koc/hal/page/PCConfigureHttpPage.java
 mode change 100644 => 100755 src/se/koc/hal/page/PCHeatMapHttpPage.java

diff --git a/hal.conf b/hal.conf
new file mode 100755
index 00000000..93ddf342
--- /dev/null
+++ b/hal.conf
@@ -0,0 +1,2 @@
+http_port=8080
+sync_port=6666
\ No newline at end of file
diff --git a/src/se/koc/hal/HalContext.java b/src/se/koc/hal/HalContext.java
old mode 100644
new mode 100755
index acb9c5d9..ae9aa799
--- a/src/se/koc/hal/HalContext.java
+++ b/src/se/koc/hal/HalContext.java
@@ -2,15 +2,41 @@ package se.koc.hal;
 
 import zutil.db.DBConnection;
 
+import java.io.FileReader;
+import java.util.Properties;
+
 public class HalContext {
+    // Constants
+    private static final String CONF_FILE = "hal.conf";
+
+    // Variables
+    public static DBConnection db;
 	
-	public static DBConnection db;
+	public static Properties conf;
+	private static Properties defaultConf;
+
+
+	static {
+		defaultConf = new Properties();
+		defaultConf.setProperty("http_port", ""+8080);
+		defaultConf.setProperty("sync_port", ""+6666);
+
+        HalContext.initialize();
+	}
 	
 	
-	
-	
-	
-	public static void initialize() throws Exception{
-		db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
+	public static void initialize(){
+        try {
+            // Read conf
+            conf = new Properties(defaultConf);
+            FileReader in = new FileReader(CONF_FILE);
+            conf.load(in);
+            in.close();
+
+            // Init DB
+            db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
+        } catch (Exception e){
+            throw new RuntimeException(e);
+        }
 	}
 }
diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index b394b395..a2def8ab 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -31,8 +31,6 @@ public class PowerChallenge {
 
     public static void main(String[] args) throws Exception {
 
-    	HalContext.initialize();
-    	
     	// init logging
     	LogUtil.setGlobalLevel(Level.ALL);
     	LogUtil.setGlobalFormatter(new CompactLogFormatter());
@@ -43,7 +41,8 @@ public class PowerChallenge {
             daemon.initiate(daemonTimer);
         }
         
-        HttpServer http = new HttpServer(80);
+        HttpServer http = new HttpServer(
+                Integer.parseInt(HalContext.conf.getProperty("http_port")));
         http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
         http.setPage("/", new PCOverviewHttpPage());
         http.setPage("/configure", new PCConfigureHttpPage());
diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
index 180c3625..538d70b2 100755
--- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
@@ -21,11 +21,10 @@ import zutil.net.threaded.ThreadedTCPNetworkServerThread;
 
 public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
 	private static final Logger logger = LogUtil.getLogger();
-	public static final int SERVER_PORT = 6666;
 
 
 	public DataSynchronizationDaemon() {
-		super(SERVER_PORT);
+		super(Integer.parseInt(HalContext.conf.getProperty("sync_port")));
 	}
 
 	@Override
diff --git a/src/se/koc/hal/page/PCConfigureHttpPage.java b/src/se/koc/hal/page/PCConfigureHttpPage.java
old mode 100644
new mode 100755
diff --git a/src/se/koc/hal/page/PCHeatMapHttpPage.java b/src/se/koc/hal/page/PCHeatMapHttpPage.java
old mode 100644
new mode 100755