X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=commands%2Fchecksync.py;h=d92d60fe7c0e1e16ae99a3261c2d5cbcd6ae7585;hp=2a17687ad02c5f9512ef8ed39abf210894c6815b;hb=8f41cc57e1e5ea09b376526d738afe0136b7a9e9;hpb=fca41a6cbcbf2453d7f9b11baebc1ee97510dd4c

diff --git a/commands/checksync.py b/commands/checksync.py
index 2a17687..d92d60f 100755
--- a/commands/checksync.py
+++ b/commands/checksync.py
@@ -3,29 +3,48 @@
 from monitor.database.info.model import *
 import sys
 
-fbquery = HistoryNodeRecord.query.all()
-hostnames = [ n.hostname for n in fbquery ]
 
 if True:
-	for hn in hostnames:
-		fbrec = FindbadNodeRecord.query.filter_by(hostname=hn).order_by(FindbadNodeRecord.version.desc()).first()
-		if len(fbrec.versions) >= 2:
-			if fbrec.version != fbrec.versions[-2].version + 1:
-				print fbrec.hostname, fbrec.version, fbrec.versions[-2].version
-				fbrec.version = fbrec.versions[-2].version + 1
-				fbrec.flush()
-
-	session.flush()
-
-fbquery = HistoryPCURecord.query.all()
-pcus = [ n.plc_pcuid for n in fbquery ]
-
-for pcuid in pcus:
-	fbrec = FindbadPCURecord.query.filter_by(plc_pcuid=pcuid).order_by(FindbadPCURecord.version.desc()).first()
-	if len(fbrec.versions) >= 2:
-		if fbrec.version != fbrec.versions[-2].version + 1:
-			print fbrec.plc_pcuid, fbrec.version, fbrec.versions[-2].version
-			fbrec.version = fbrec.versions[-2].version + 1
-			fbrec.flush()
+    fbquery = HistorySiteRecord.query.all()
+    loginbases = [ h.loginbase for h in fbquery ]
+
+    for lb in loginbases:
+        h = HistorySiteRecord.query.filter_by(loginbase=lb).first()
+        if len(h.versions) >= 2:
+            if h.version != h.versions[-2].version + 1:
+                print h.loginbase, h.version, h.versions[-2].version
+                h.version = h.versions[-2].version + 1
+                h.flush()
+
+    session.flush()
+
+
+
+if True:
+    fbquery = HistoryNodeRecord.query.all()
+    hostnames = [ n.hostname for n in fbquery ]
+
+    for hn in hostnames:
+        fbrec = FindbadNodeRecord.query.filter_by(hostname=hn).order_by(FindbadNodeRecord.version.desc()).first()
+        if len(fbrec.versions) >= 2:
+            if fbrec.version != fbrec.versions[-2].version + 1:
+                print fbrec.hostname, fbrec.version, fbrec.versions[-2].version
+                fbrec.version = fbrec.versions[-2].version + 1
+                fbrec.flush()
+
+    session.flush()
+
+
+if True:
+    fbquery = HistoryPCURecord.query.all()
+    pcus = [ n.plc_pcuid for n in fbquery ]
+
+    for pcuid in pcus:
+        fbrec = FindbadPCURecord.query.filter_by(plc_pcuid=pcuid).order_by(FindbadPCURecord.version.desc()).first()
+        if len(fbrec.versions) >= 2:
+            if fbrec.version != fbrec.versions[-2].version + 1:
+                print fbrec.plc_pcuid, fbrec.version, fbrec.versions[-2].version
+                fbrec.version = fbrec.versions[-2].version + 1
+                fbrec.flush()
 
 session.flush()