projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6588-split-manage-account
[arvados.git]
/
services
/
api
/
lib
/
eventbus.rb
diff --git
a/services/api/lib/eventbus.rb
b/services/api/lib/eventbus.rb
index ff74ba8cf30a48353b58c0df696506e1acb59428..ac53876122d6b2e74b0d9fed85a56308308465b4 100644
(file)
--- a/
services/api/lib/eventbus.rb
+++ b/
services/api/lib/eventbus.rb
@@
-140,10
+140,15
@@
class EventBus
# No filters set up, so just record the sequence number
ws.last_log_id = notify_id
end
# No filters set up, so just record the sequence number
ws.last_log_id = notify_id
end
+ rescue ArgumentError => e
+ # There was some kind of user error.
+ Rails.logger.warn "Error publishing event: #{$!}"
+ ws.send ({status: 500, message: $!}.to_json)
+ ws.close
rescue => e
Rails.logger.warn "Error publishing event: #{$!}"
Rails.logger.warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
rescue => e
Rails.logger.warn "Error publishing event: #{$!}"
Rails.logger.warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
- ws.send ({status: 500, message:
'error'
}.to_json)
+ ws.send ({status: 500, message:
$!
}.to_json)
ws.close
# These exceptions typically indicate serious server trouble:
# out of memory issues, database connection problems, etc. Go ahead and
ws.close
# These exceptions typically indicate serious server trouble:
# out of memory issues, database connection problems, etc. Go ahead and