import types
import ConfigParser
import traceback
+import random
logger = logging.getLogger()
logger.setLevel(logging.INFO)
self.config_parser.set('gladosreplaced','type',"slugplaymp3")
self.config_parser.add_section('nothing')
self.config_parser.set('nothing','type',"nothing")
+ self.config_parser.add_section('randomset1')
+ self.config_parser.set('randomset1','type',"random")
+ self.config_parser.set('randomset1','one_of',"halflife2 gladosparty")
self.config_parser.add_section('mapping')
self.config_parser.set('mapping','DEFAULT',"halflife2")
self.config_parser.set('mapping','PANIC',"monkeyscream")
underscore_pos=name.find('_')
if underscore_pos < 0:
raise AttributeError
+ return self.getSectionValue(name[0:underscore_pos], name[underscore_pos+1:])
+
+ def getSectionValue(self, section, name):
try:
- return self.config_parser.get(name[0:underscore_pos], name[underscore_pos+1:])
+ return self.config_parser.get(section,name)
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
return None
raise AttributeError
+def runRandomAction(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
try:
cmd = "ssh -i /flash/tuer/id_rsa -o PasswordAuthentication=no -o StrictHostKeyChecking=no %RHOST% %RSHELL%"
- cmd = cmd.replace("%RHOST%",remote_host).replace("%RSHELL%",remote_shell).replace("%ARG%", " ".join(args)).replace("%USER%", " ".user)
+ cmd = cmd.replace("%RHOST%",remote_host).replace("%RSHELL%",remote_shell).replace("%ARG%", " ".join(args)).replace("%USER%", user)
logging.debug("runRemoteCommand: Executing: "+cmd)
sshp = subprocess.Popen(cmd.split(" "), bufsize=1024, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False)
logging.debug("runRemoteCommand: pid %d: running=%d" % (sshp.pid,sshp.poll() is None))
def runShellCommand(cmd,ptimeout,stdinput,user,args=[]):
global uwscfg
- cmd = cmd.replace("%ARG%"," ".join(args)).replace("%USER%", " ".user)
+ 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))
#"registered" actions
if action_type == "remotecmd":
- return runRemoteCommand(uwscfg.getValue(action_name+"_remote_host"), uwscfg.getValue(action_name+"_remote_shell"), user=user, args=args)
+ return runRemoteCommand(uwscfg.getSectionValue(action_name,"remote_host"), uwscfg.getSectionValue(action_name,"remote_shell"), user=user, args=args)
elif action_type == "shellcmd":
- return runShellCommand(cmd=uwscfg.getValue(action_name+"_cmd"), ptimeout=uwscfg.getValue(action_name+"_timeout"), stdinput=uwscfg.getValue(action_name+"_stdinput"), user=user, args=args)
+ return runShellCommand(cmd=uwscfg.getSectionValue(action_name,"cmd"), ptimeout=uwscfg.getSectionValue(action_name,"timeout"), stdinput=uwscfg.getSectionValue(action_name,"stdinput"), user=user, args=args)
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)
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: