X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fscanapi.py;h=5928c5abf63ed8a62d8b86275ea73c95d9ab917a;hb=ce9101bfa7720c131a982220f2905e4439b324fc;hp=5a72319520bf47b7b53056574dc29ffcdc21d261;hpb=7028fdb5e122089f2e1fb1c6a9178ab8f8aa5fe1;p=monitor.git

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 5a72319..5928c5a 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -197,6 +197,7 @@ class ScanNodeInternal(ScanInterface):
 			try:
 				for port in [22, 806]: 
 					ssh = command.SSH('root', nodename, port)
+					#echo '  "fs_status":"'`touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then touch /vservers/monitor.log 2>&1 ; fi ; grep proc /proc/mounts | grep ro,`'",'
 
 					(oval, errval) = ssh.run_noexcept2(""" <<\EOF
 						echo "{"
@@ -204,7 +205,6 @@ class ScanNodeInternal(ScanInterface):
 						echo '  "bmlog":"'`ls /tmp/bm.log`'",'
 						echo '  "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",'
 						echo '  "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",'
-						echo '  "fs_status":"'`touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then touch /vservers/monitor.log 2>&1 ; fi ; grep proc /proc/mounts | grep ro,`'",'
 						echo '  "dns_status":"'`host boot.planet-lab.org 2>&1`'",'
 						echo '  "princeton_comon_dir":"'`ls -d /vservers/princeton_comon`'",'
 
@@ -236,6 +236,7 @@ EOF				""")
 				print traceback.print_exc()
 				sys.exit(1)
 
+			values['fs_status'] = ""
 			print "ALLVERSIONS: %s %s" % (nodename, values['rpm_versions'])
 
 			print "RPMVERSION: %s %s" % (nodename, values['rpm_version'])
@@ -490,7 +491,7 @@ class ScanPCU(ScanInterface):
 						values['dns_status'] = "DNS-OK"
 					else:
 						values['dns_status'] = "DNS-MISMATCH"
-						continue_probe = False
+						values['plc_pcu_stats']['hostname'] = values['plc_pcu_stats']['ip']
 
 				except Exception, err:
 					values['dns_status'] = "DNS-NOENTRY"