Commit b14e27be authored by Maude Le Jeune's avatar Maude Le Jeune
Browse files

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

parents cfc43bdb baea1871
......@@ -282,7 +282,11 @@ def launch_ccali(pipe, n, address=('127.0.0.1',5000), authkey='secret', job_dir=
'-a', address[0]]+b, stdin=subprocess.PIPE)
s.communicate(input=pickle.dumps(pipe))
for i in range(n):
import re
l = subprocess.Popen(['qjob', '-wide','-nh'], stdout=subprocess.PIPE).communicate()[0]
existing_process = re.findall( '%s([0-9]*)'%job_name,l)
starting_num = max([int(p) for p in existing_process])+1
for i in range(starting_num,starting_num+n):
name = '%s%d'%(job_name,i)
jobfile = get_log_file (pipe, name+'.job')
errfile = jobfile.replace('job', 'err')
......
......@@ -78,9 +78,7 @@ def main(options, args):
SchedulerManager.register('get_scheduler', callable=lambda:s)
mgr = SchedulerManager(address=(options.address, options.port), authkey='secret')
server = mgr.get_server()
mgr.start()
print "Started"
# Now that logging is set up decouple from parent environnement
......@@ -89,8 +87,9 @@ def main(options, args):
redirect_stream(sys.stderr, None)
os.chdir(WORKDIR)
server.serve_forever()
sched_proxy = mgr.get_scheduler()
sched_proxy.run()
except BaseException, e:
logger.critical(str(e))
finally:
......
......@@ -13,5 +13,5 @@ setup(name='pipelet',
'pipelet.pipeline','pipelet.tracker', 'pipelet.repository', 'pipelet.launchers',
'pipelet.task', 'pipelet.utils', 'pipelet.web'],
package_data={'pipelet': ['static/*']},
scripts=['scripts/pipeweb', 'scripts/pipeutils']
scripts=['scripts/pipeweb', 'scripts/pipeutils', 'scripts/pipeletd']
)
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