raise AttributeError
return self.getSectionValue(name[0:underscore_pos], name[underscore_pos+1:])
- def getSectionValue(self, section, name):
+ def getSectionValue(self, section, name):
try:
return self.config_parser.get(section,name)
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
return None
-
+
def __getattr__(self, name):
underscore_pos=name.find('_')
if underscore_pos < 0:
def runRandomAction(action_list,user,args=[]):
- global uwscfg
- if not type(action_list) == types.ListType):
- raise ValueError("runRandomAction: action_list must be a list")
- return executeAction(random.choice(action_list),user,args)
-
+ if not type(action_list) == types.ListType:
+ raise ValueError("runRandomAction: action_list must be a list")
+ return executeAction(random.choice(action_list),user,args)
+
def runRemoteCommand(remote_host,remote_shell,user,args=[]):
global sshp,uwscfg
sshp = None
cmd = cmd.replace("%ARG%"," ".join(args)).replace("%USER%", user)
if ptimeout is None or float(ptimeout) > 45:
ptimeout = 45
- popenTimeout2(cmd,stdinput,ptimeout=float(ptimeout))
+ else:
+ ptimeout = int(float(ptimeout))
+ popenTimeout2(cmd,stdinput,ptimeout=ptimeout)
def executeAction(action_name, user, args=[]):
if action_name is None:
logging.error("executeAction: action %s not found or has no type" % action_name)
return False
action_delay=uwscfg.getValue(action_name+"_delay")
- logging.debug("executeAction, action_name=%s, action_type=%s, action_delay=%s" % (action_name,action_type,action_delay))
+ logging.info("executeAction %s of type %s for user %s with delay %s" % (action_name,action_type,user,action_delay))
if not action_delay is None:
time.sleep(float(action_delay))
elif action_type == "nothing":
return True
elif action_type == "random":
- return runRandomAction(action_list=uwscfg.getSectionValue(action_name,"one_of").split(" "),user=user,args=args)
+ return runRandomAction(action_list=uwscfg.getSectionValue(action_name,"one_of").split(" "),user=user,args=args)
else:
return executeAction(action_type,user=user,args=args)
return False
def exitHandler(signum, frame):
- logging.info("Update-Web-Status stopping")
+ logging.info("stopping")
try:
conn.close()
except: