Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 4028134c authored by Maude Le Jeune's avatar Maude Le Jeune
Browse files

Merge branch 'master' of gitorious.org:pipelet/pipelet

parents 6f74cc6d d73859a0
......@@ -21,18 +21,3 @@ from task import *
from environment import *
from launchers import *
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='9a228d498a98e442020758e6976a12c692c2c774'
__version__='6ba207fbc04582bf2fb6858b9a56a1094a3b050d'
......@@ -282,7 +282,7 @@ class Environment(EnvironmentBase):
+glob(path.join(self._worker.pipe.get_data_dir(segx),path.join('*/',y)))
def logged_subprocess(self, args, shell=False, except_on_failure=True, name=None):
def logged_subprocess(self, args, shell=False, except_on_failure=True, name=None, of=None):
""" Execute a subprocess and log its output.
Create files process_name.log and process_name.err. If shell is set to True, the command is run via a shell. If except_on_failure set to True, raise an exception when command execution return non zero
......@@ -294,7 +294,8 @@ class Environment(EnvironmentBase):
proc = args[0]
if name is None:
name = path.basename(proc)
of = self.get_data_fn(name+'.log')
if of is None:
of = self.get_data_fn(name+'.log')
ef = self.get_data_fn(name+'.err')
o = file(of,'w')
e = file(ef,'w')
......
......@@ -531,6 +531,8 @@ Delete products directories of a given task id. The list of task id is '-' separ
else:
if os.path.splitext(filepath)[1] in ['.log','.txt','.list','.py']:
return serve_file(filepath, content_type='text/plain', disposition="inline")
elif os.path.splitext(filepath)[1] in ['.fits','.fz']:
return serve_file(filepath, content_type='application/fits', disposition="inline")
elif os.path.splitext(filepath)[1] in ['.pkl', '.meta', '.args', '.version']:
return self.serve_pickle(filepath)
else:
......
......@@ -85,9 +85,11 @@ def str_file(obj):
>>> str_file((1,))
'1_'
"""
try:
s = clean_string(str(obj.values()))
except:
if isinstance(obj, dict):
ll = [el[1] for el in sorted(obj.items())]
s = clean_string(str(ll))
else:
s = clean_string(str(obj))
return s
......
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