Merge branch '11235-log-retryable'

[arvados.git] / services / api / lib / eventbus.rb

diff --git a/services/api/lib/eventbus.rb b/services/api/lib/eventbus.rb
index 5e413d5cabf580688693754af4201497f2d79e0a..11b178d98547ef4d4073527fa4ac55e707fb86cc 100644 (file)
--- a/services/api/lib/eventbus.rb
+++ b/services/api/lib/eventbus.rb
@@ -3,10 +3,11 @@
 Thread.abort_on_exception = true
 
 require 'eventmachine'
-require 'oj'
 require 'faye/websocket'
-require 'record_filters'
 require 'load_param'
+require 'oj'
+require 'record_filters'
+require 'safe_json'
 require 'set'
 require 'thread'
 
@@ -79,7 +80,7 @@ class EventBus
   end
 
   def send_message(ws, obj)
-    ws.send(Oj.dump(obj, mode: :compat))
+    ws.send(SafeJSON.dump(obj))
   end
 
   # Push out any pending events to the connection +ws+
@@ -181,7 +182,7 @@ class EventBus
     begin
       begin
         # Parse event data as JSON
-        p = (Oj.strict_load event.data).symbolize_keys
+        p = SafeJSON.load(event.data).symbolize_keys
         filter = Filter.new(p)
       rescue Oj::Error => e
         send_message(ws, {status: 400, message: "malformed request"})