Commit d413f619 authored by Vincent Pelletier's avatar Vincent Pelletier

Move log files to testrunner's log_directory.

Also, don't name custom log files with a leading dot in partition's root.
This is reserved to supervisord logfiles. Follow (somewhat) the FHS and
put log files in testrunner partition's /var/log.
parent 4d357a41
...@@ -92,6 +92,7 @@ class Recipe(BaseSlapRecipe): ...@@ -92,6 +92,7 @@ class Recipe(BaseSlapRecipe):
test_node_title=self.parameter_dict.get('test_node_title'), test_node_title=self.parameter_dict.get('test_node_title'),
project_title=self.parameter_dict.get('project_title'), project_title=self.parameter_dict.get('project_title'),
bin_directory=self.bin_directory, bin_directory=self.bin_directory,
log_directory=self.log_directory,
run_directory=self.run_directory, run_directory=self.run_directory,
# botenvironemnt is splittable string of key=value to substitute # botenvironemnt is splittable string of key=value to substitute
# environment of running bot # environment of running bot
......
...@@ -57,12 +57,12 @@ def safeRpcCall(function, *args): ...@@ -57,12 +57,12 @@ def safeRpcCall(function, *args):
def getInputOutputFileList(config, command_name): def getInputOutputFileList(config, command_name):
stdout = open(os.path.join( stdout = open(os.path.join(
config['instance_root'],'.%s_out' % command_name), config['log_directory'], '%s_out' % (command_name, )),
'w+') 'w+')
stdout.write("%s\n" % command_name) stdout.write("%s\n" % command_name)
stderr = open(os.path.join( stderr = open(os.path.join(
config['instance_root'],'.%s_err' % command_name), config['log_directory'], '%s_err' % (command_name, )),
'w+') 'w+')
return (stdout, stderr) return (stdout, stderr)
slapos_controler = None slapos_controler = None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment