X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix%2Fzabbixsync.py;h=1c0e40538a639101e098548a52ecd8b19c93ad81;hb=4875f56c715aa643ff9a1f5a3a801f240b47fe96;hp=fd2126e7179cc06704d21c95159e2b9bf16e6674;hpb=170be1fae6fd5956641668443245c50fbf7fd566;p=monitor.git

diff --git a/zabbix/zabbixsync.py b/zabbix/zabbixsync.py
index fd2126e..1c0e405 100755
--- a/zabbix/zabbixsync.py
+++ b/zabbix/zabbixsync.py
@@ -2,17 +2,16 @@
 
 import sys
 import site
-from monitor.wrapper import plc
+from monitor.wrapper import plc, plccache
 from monitor import database
 
 import zabbixsite
-from monitor.database.dborm import session
+from monitor.database.dborm import zab_session as session
 
-print "test"
 
-plcdb = database.dbLoad("l_plcsites")
-netid2ip = database.dbLoad("plcdb_netid2ip")
-lb2hn = database.dbLoad("plcdb_lb2hn")
+plcdb = plccache.l_sites # database.dbLoad("l_plcsites")
+netid2ip = plccache.plcdb_netid2ip # database.dbLoad("plcdb_netid2ip")
+lb2hn = plccache.plcdb_lb2hn # database.dbLoad("plcdb_lb2hn")
 
 def get_site_iplist(loginbase):
 	node_list = lb2hn[loginbase]
@@ -39,11 +38,11 @@ def add_loginbase(loginbase):
 if __name__=="__main__":
 
 	from monitor import parser as parsermodule
-	parser = parsermodule.getParser()
+	parser = parsermodule.getParser(['cacheset'])
 	parser.set_defaults( setupglobal=False, syncsite=True, site=None)
 	parser.add_option("", "--setupglobal", action="store_true", dest="setupglobal",
 						help="Setup global settings.")
-	parser.add_option("", "--nosite", action="store_true", dest="syncsite",
+	parser.add_option("", "--nosite", action="store_false", dest="syncsite",
 						help="Do not sync sites.")
 	parser.add_option("", "--site", dest="site",
 						help="Sync only given site name.")
@@ -51,8 +50,10 @@ if __name__=="__main__":
 
 	if opts.setupglobal:
 		zabbixsite.setup_global()
+		session.flush()
 
 	if opts.syncsite:
+		api = plc.getCachedAuthAPI()
 		query = {'peer_id' : None}
 		if opts.site:
 			query.update({'login_base' : opts.site})