Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More web fixes #177

Merged
merged 3 commits into from
Jun 22, 2014
Merged

More web fixes #177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faad9e8
make jobs say complete
squirrelo Jun 22, 2014
2e9cc21
more changes to run
squirrelo Jun 22, 2014
ad4329c
even more changes to run
squirrelo Jun 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions qiita_ware/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,31 @@ def run_analysis(user, analysis):
o_fmt = ' '.join(['%s %s' % (k, v) for k, v in options.items()])
c_fmt = str("%s %s" % (command, o_fmt))

# send running message to user wait page
job.status = 'running'
msg["msg"] = "Running"
r_server.rpush(user + ":messages", dumps(msg))

# run the command
try:
job.status = 'running'
msg["msg"] = "Running"
r_server.rpush(user + ":messages", dumps(msg))
r_server.publish(user, dumps(msg))
qiita_compute.submit_sync(c_fmt)
job.add_results([(options['--output_dir'], 7)])
except:
job.status = 'error'
all_good = False
job.status = 'error'
msg["msg"] = "ERROR"
r_server.rpush(user + ":messages", dumps(msg))
r_server.publish(user, dumps(msg))
print("Failed compute on job id %d: %s" %
(job_id, c_fmt))
continue

else:
msg["msg"] = "Completed"
r_server.rpush(user + ":messages", dumps(msg))
r_server.publish(user, dumps(msg))
# FIX THIS Should not be hard coded
job.add_results([options["--output_dir"], "directory"])
job.status = 'completed'
msg["msg"] = "Completed"
job.status = 'completed'
r_server.rpush(user + ":messages", dumps(msg))
r_server.publish(user, dumps(msg))
# FIX THIS Should not be hard coded
job.add_results([options["--output_dir"], "directory"])

# send websockets message that we are done
msg["msg"] = "allcomplete"
Expand Down