X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fdatabase%2Finfo%2Fhistory.py;h=22c8d7b4fa32f8731dcc717d08b2752e5683571e;hb=4bf13ed6dd1e71c3f065b7a1957cd3d76c121217;hp=6d2ed83d7b1f11132385fd6417a5e77f601432f7;hpb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;p=monitor.git

diff --git a/monitor/database/info/history.py b/monitor/database/info/history.py
index 6d2ed83..22c8d7b 100644
--- a/monitor/database/info/history.py
+++ b/monitor/database/info/history.py
@@ -16,6 +16,10 @@ class HistoryNodeRecord(Entity):
 	last_changed = Field(DateTime,default=datetime.now)
 	status = Field(String,default="unknown")
 	haspcu = Field(Boolean,default=False)
+	firewall = Field(Boolean,default=False)
+	plc_nodeid = Field(Int,default=1)
+	plc_siteid = Field(Int,default=1)
+
 	acts_as_versioned(ignore=['last_changed', 'last_checked'])
 
 	@classmethod
@@ -41,6 +45,7 @@ class HistoryPCURecord(Entity):
 
 class HistorySiteRecord(Entity):
 	loginbase = Field(String(250),primary_key=True)
+	plc_siteid = Field(Int,default=1)
 
 	last_checked = Field(DateTime,default=datetime.now)
 	last_changed = Field(DateTime,default=datetime.now)
@@ -61,10 +66,14 @@ class HistorySiteRecord(Entity):
 	message_status = Field(String, default=None)
 	message_queue = Field(String, default=None) 
 	message_created = Field(DateTime, default=None)
+	#message_last_reply = Field(DateTime, default=None)
 
 	penalty_level   = Field(Int, default=0)
 	penalty_applied = Field(Boolean, default=False)
-	acts_as_versioned(ignore=['last_changed', 'last_checked'])
+	penalty_pause   = Field(Boolean, default=False)
+	penalty_pause_time   = Field(DateTime, default=None)
+
+	acts_as_versioned(ignore=['last_changed', 'last_checked', 'message_status', 'penalty_pause_time'])
 
 	@classmethod
 	def by_loginbase(cls, loginbase):