From 2c59ae5693ddc724d2d27d3e47d4226f350612dd Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 4 Jan 2016 19:21:26 +0100
Subject: [PATCH] Added event table and added ignored table to DB upgrade

Former-commit-id: 9237a2457630ac5fa1e41c7e6b16214ca24cba08
---
 hal-default.db                     | Bin 13312 -> 16384 bytes
 src/se/koc/hal/HalContext.java     |   4 +---
 src/se/koc/hal/PowerChallenge.java |   8 ++++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hal-default.db b/hal-default.db
index cd99a46dfab9d70c1ac022eae6b600c0713a2eb8..7a7f4d09ab1c9575e657c0f34075a0a0588f9210 100755
GIT binary patch
delta 704
zcmZq3XlP)ZAT2nXfq_8)i1~n+5r`Wm>KIGUX3%}c#R}vxF@FP+3<Au*fs6+Xn;AAw
z7G$y9xY?PR3n<LZ4J0@@Hu12qEN0<h+04T8o1f8ilMEw|Fi?V-aV-PWDW+D&wT!$B
zjSRIwomusKyzGsfyzJtdnv9LUC5cHnsi|eDc_r~Fi6x2gMTzC8JU-_jSH}=ng%C$4
zA6Eq>R7oWT4PGwJgp$nM)Z&uF+=2v7PrndXch?{tkT67TW(umPBgh`O5HFWzqbv`*
zxVSiDlO)11V6DtptOnUQIafi`4P-%SacWUKy7_sDxv2@9A+8Z2U`Lcx79ewz^YhX&
z(;@OeyC-XC-<TYu<+@o-(~NPE4##2z78X!gaxpR8W?)WWy3NG3S&-!qBUht4AG>&X
zIAde(<j-2BlbN-p`1w(smoWK<mMUYy<O9sotYFtqe#k850}MMKE=^!e^Z<jqkqKx9
dDAer{9>o#rsAfY#eeyPDRfN&z5Tge&@Bl+X!rTA=

delta 159
zcmZo@U~I^kAT2nHfq{V+h?#+y5s0fN>KIGUV$glY#R?K({tYA<xS4-5PGxw&u$f`=
zWI-0ojhmgBxi~%jLR^7zoE)1BSa>$G2>j+|G}$D>$Ro_Okb#*|je${(DTY}Cq@8Ku
zW<eGq#?7a+%or!PYPqri#o8xZDY$SoiEy)vhlevZvro3P)0%8&$31zi=8Z)<8~`RY
BBD(+p

diff --git a/src/se/koc/hal/HalContext.java b/src/se/koc/hal/HalContext.java
index 1bd59bbe..25129a96 100755
--- a/src/se/koc/hal/HalContext.java
+++ b/src/se/koc/hal/HalContext.java
@@ -79,6 +79,7 @@ public class HalContext {
 
                 logger.fine(String.format("Upgrading DB (from: v%s, to: v%s)...", dbVersion, defaultDBVersion));
                 final DBUpgradeHandler handler = new DBUpgradeHandler(referenceDB);
+                handler.addIgnoredTable("db_version_history");
                 handler.setTargetDB(db);
                 
                 //read upgrade path preferences from the reference database
@@ -109,9 +110,6 @@ public class HalContext {
 				});
                 
                 handler.upgrade();
-                
-                //remove table from target database. this table is supposed to only be put in the reference db.
-                db.exec("DROP TABLE db_version_history");
 
                 logger.info("DB upgrade done");
                 dbConf.setProperty(PROPERTY_DB_VERSION, defaultDBConf.getProperty(PROPERTY_DB_VERSION));
diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index 9baea619..e30c39af 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -27,11 +27,11 @@ import java.util.logging.Level;
  * Created by Ziver on 2015-12-03.
  */
 public class PowerChallenge {
-
 	
     private static HalDaemon[] daemons;
     private static HalHttpPage[] pages;
 
+
     public static void main(String[] args) throws Exception {
         // init logging
         CompactLogFormatter formatter = new CompactLogFormatter();
@@ -41,11 +41,12 @@ public class PowerChallenge {
         LogUtil.setFormatter("zutil", formatter);
         LogUtil.setGlobalFormatter(formatter);
 
+
         // init DB and other configurations
         HalContext.initialize();
         DBConnection db = HalContext.getDB();
 
-        // Init sensors and controllers
+        // Init sensors,events and controllers
         ControllerManager.initialize();
         for(Sensor sensor : Sensor.getLocalSensors(db)){
             ControllerManager.getInstance().register(sensor);
@@ -54,6 +55,7 @@ public class PowerChallenge {
             ControllerManager.getInstance().register(event);
         }
 
+
         // init daemons
         daemons = new HalDaemon[]{
                 new DataAggregatorDaemon(),
@@ -67,6 +69,8 @@ public class PowerChallenge {
             daemon.initiate(executor);
         }
 
+
+        // init http server
         pages = new HalHttpPage[]{
                 new PCOverviewHttpPage(),
                 new PCHeatMapHttpPage(),