X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor%2Fscanapi.py;h=5928c5abf63ed8a62d8b86275ea73c95d9ab917a;hp=f5c4f5f24761900a6f4c7bc627e7f62862f54fa9;hb=035a846d8617889c01cae12bc6d64eb7c48b64bd;hpb=6a2f47ac05289fd850dc724e0da13599e7846294

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index f5c4f5f..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'])