--- checkStation/checkStation.py 2005/05/15 11:02:01 1.4
+++ checkStation/checkStation.py 2005/05/15 12:12:15 1.5
@@ -6,7 +6,10 @@ import os
import os.path
import time
-module_list=['11150','11220','11240','11340','12010','13110','13210','13310','13500','20610','21210','21600','22310','23110','24110','24212','24231','24241','24251','24321','24341','24411','24421','24431','24441','24511','24521','30511','31111','31120','31131','31142','31151','31161','31171','31211','31221','31231','31252','31305','31410','32010','33100']
+module_list=['11150','11220','11240','11340','12010','13110','13210','13310','13500','20610','21210','21600','22310','23110','24110','24212','24231','24241','24251','24321','24341','24411','24421','24431','24441','24511','24521','30511','31111','31120','31131','31142','31151','31161','31171','31221','31231','31252','31305','31410','32010','33100']
+
+# station non checked: 31211
+
grepString="firefox-bin"
def zptFile(self, path, orphaned=False):
@@ -90,16 +93,19 @@ class checkStation(SimpleItem):
{'label':'checkRebootDead','action':'checkRebootDead'},
{'label':'Reboot Overview','action':'rebootOverview'},
)
- def asctime(self):
- return time.asctime(tm)
-
+ def asctime(self,tm):
+ try:
+ return time.asctime(tm)
+ except:
+ return "never"
+
def __init__(self, id, path):
"""init"""
self.path=path #pfad fuer logfile
self.id=id
self.modulOverview={}
- def checkStation(self,nr,time=5,formats=["VID"]):
+ def checkStation(self,nr,time=10,formats=["VID","BRA","ZOG"]):
"""check station with nr nr"""
txt=[]
@@ -153,18 +159,18 @@ class checkStation(SimpleItem):
if ret.find("grep") <= 0:
process=ret.split()[0]
str="""ssh root@%s kill -9 %s """
- #os.popen(str%(ip,process)).readlines()
- retStr+=str%(ip,process) + "/n"
+ os.popen(str%(ip,process)).readlines()
+ retStr+=str%(ip,process) + "
"
return retStr
- def checkRebootDead(self,timer=5):
+ def checkRebootDead(self,timer=10):
"""checks and reboots non responding firefox"""
self.lastCheck=time.localtime()
ret=""
for modul in self.getModuls():
- checked=self.checkStation(modul,time=timer,formats=["VID"])
+ checked=self.checkStation(modul,time=timer)
if not checked[0]:
ret+=self.rebootStation(checked[3])