tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug_fix' into qa

Browse Source
This commit is contained in:
amartynov 2015-10-09 16:33:39 +03:00
commit 89633852ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/app/api2/handlers/report.rb
View File

@ -34,7 +34,7 @@ module Devops
r = Devops::Db.connector.report(id) r = Devops::Db.connector.report(id)
file = r.file file = r.file
raise RecordNotFound.new("Report '#{id}' does not exist") unless File.exists? file raise RecordNotFound.new("Report '#{id}' does not exist") unless File.exists? file
return Rack::Utils.escape_html(File.read(file)), completed?(id) return Rack::Utils.escape_html(File.read(file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')), completed?(id)
rescue RecordNotFound => e rescue RecordNotFound => e
if status(id) == Worker::STATUS::IN_QUEUE if status(id) == Worker::STATUS::IN_QUEUE
return "Task '#{id}' has been queued", false return "Task '#{id}' has been queued", false