Merge d83b7dd into 05a0fca

celluloid · Apr 5, 2013 · 782e133 · 782e133
2 parents 05a0fca + d83b7dd
commit 782e133
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/examples/server-sent-events.rb b/examples/server-sent-events.rb
@@ -15,7 +15,6 @@
     run lambda { |env|
       body = Reel::EventStream.new do |socket|
         Connections << socket
-        socket.on_error { Connections.delete socket }
       end
       [200, {'Content-Type' => 'text/event-stream'}, body]
     }
@@ -25,7 +24,15 @@
     run lambda { |env|
       msg = env['PATH_INFO'].gsub(/\/+/, '').strip
       msg = Time.now if msg.empty?
-      Connections.each { |s| s.data msg }
+
+      Connections.each do |s|
+        begin
+          s.data(msg)
+        rescue => SocketError
+          Connections.delete(s)
+        end
+      end
+
       [200, {'Content-Type' => 'text/html'}, ["Sent \"#{msg}\" to #{Connections.size} clients"]]
     }
   end

diff --git a/examples/websocket-wall.rb b/examples/websocket-wall.rb
@@ -14,10 +14,15 @@
   map '/subscribe' do
     run lambda { |env|
       if socket = env['rack.websocket']
+
         socket.on_message do |m|
-          socket << "Server got \"#{m}\" message"
+          begin
+            socket << 'Server got "%s" message' % m
+          rescue => SocketError
+            Connections.delete(socket)
+          end
         end
-        socket.on_error { Connections.delete socket }
+
         Connections << socket
         socket.read_every 1
       end
@@ -29,7 +34,15 @@
     run lambda { |env|
       msg = env['PATH_INFO'].gsub(/\/+/, '').strip
       msg = Time.now if msg.empty?
-      Connections.each { |s| s << msg }
+
+      Connections.each do |s|
+        begin
+          s << msg
+        rescue => SocketError
+          Connections.delete(s)
+        end
+      end
+
       [200, {'Content-Type' => 'text/html'}, ["Sent \"#{msg}\" to #{Connections.size} clients"]]
     }
   end