[whimsy] branch master updated: correct broadcast on ws restart, also:

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 2041258  correct broadcast on ws restart, also:
2041258 is described below

commit 204125836458214ebe3dd5227297ba155843e134
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Aug 14 10:25:34 2019 -0400

    correct broadcast on ws restart, also:
    
    * provide better diagnostics when events can't be processed
    * only fetch latest reporter drafts if there is a digest
---
 www/board/agenda/views/models/events.js.rb   | 15 ++++++++++-----
 www/board/agenda/views/models/reporter.js.rb |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/www/board/agenda/views/models/events.js.rb b/www/board/agenda/views/models/events.js.rb
index 8397f03..b517de3 100644
--- a/www/board/agenda/views/models/events.js.rb
+++ b/www/board/agenda/views/models/events.js.rb
@@ -155,8 +155,8 @@ class Events
         fetch('digest.json', credentials: 'include').then do |response|
           if response.ok
             response.json().then do |json|
-              Events.broadcast json.agenda.merge(type: agenda)
-              Events.broadcast json.reporter.merge(type: reporter)
+              Events.broadcast json.agenda.merge(type: :agenda)
+              Events.broadcast json.reporter.merge(type: :reporter)
             end
           end
         end
@@ -184,9 +184,14 @@ class Events
 
   # set message to all processes
   def self.broadcast(event)
-    event = event.inspect
-    localStorage.setItem("#{@@prefix}-event", event)
-    self.dispatch event
+    begin
+      event = event.inspect
+      localStorage.setItem("#{@@prefix}-event", event)
+      self.dispatch event
+    rescue => e
+      console.log(e)
+      console.log(event)
+    end
   end
 
   # dispatch logic (common to all tabs)
diff --git a/www/board/agenda/views/models/reporter.js.rb b/www/board/agenda/views/models/reporter.js.rb
index e334522..b6adca3 100644
--- a/www/board/agenda/views/models/reporter.js.rb
+++ b/www/board/agenda/views/models/reporter.js.rb
@@ -40,5 +40,5 @@ class Reporter
 end
 
 Events.subscribe :reporter do |message|
-  Reporter.fetch(message.agenda, message.digest)
+  Reporter.fetch(message.agenda, message.digest) if message.agenda
 end