history storage(prototype) - feature #30 implementation

HouseAgent.conf

@@ -12,6 +12,7 @@
 #               - False
 #               default: 5
 # dbpath        path to Sqlite DB file, leave empty for system default
+# dbpatharchive path to Archive Sqlite DB file, leave empty for system default
 # runasservice  run as service under Windows
 #               default: False
 # -----------------------------------------------------------------------------
@@ -22,6 +23,7 @@ logsize=1024
 logcount=5
 logconsole=True
 dbpath=
+dbpatharchive=
 
 runasservice=False
 

HouseAgent.py

@@ -3,6 +3,7 @@
 from houseagent import config_file
 from houseagent.core.coordinator import Coordinator
 from houseagent.core.events import EventHandler
+from houseagent.core.history import HistoryCollector, HistoryAggregator
 from houseagent.core.web import Web
 from houseagent.core.database import Database
 from houseagent.core.databaseflash import DatabaseFlash
@@ -17,7 +18,6 @@ class MainWrapper():
     def start(self):     
 
         self.log = pluginapi.Logging("Main")
-        self.log.set_level(config.general.loglevel)
 
         self.log.debug("Starting HouseAgent database layer...")
         if config.embedded.enabled:
@@ -32,7 +32,13 @@ def start(self):
 
         self.log.debug("Starting HouseAgent event handler...")
         event_handler = EventHandler(coordinator, database)
-
+
+        self.log.debug("Starting Houseagent history aggregator")
+        histagg = HistoryAggregator(database)
+
+        self.log.debug("Starting Houseagent history collector")
+        HistoryCollector(database, histagg)
+
         self.log.debug("Starting HouseAgent web server...")
         Web(self.log, config.webserver.host, config.webserver.port,\
             config.webserver.backlog, coordinator, event_handler, database)

archive/readme.txt

@@ -0,0 +1 @@
+This is directory for storing archive DB files

houseagent/core/databaseflash.py

@@ -5,7 +5,8 @@
 @author: Daniel Berenguer
 '''
 
-from database import Database, DataHistory
+from database import Database
+#from database import Database, DataHistory
 from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.task import LoopingCall
@@ -78,7 +79,8 @@ def update_or_add_value(self, name, value, pluginid, address, time=None):
                 # Update value
                 curr_val.value = value
                 curr_val.last_update = updatetime
-
+
+            # XXX: need to be rewriten
             # Log value?
             if current_value[0][2] not in (0, None):
                 DataHistory("data", value_id, value, "GAUGE", 60, int(time))