punchblock 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86410aa568b8fd10b260d97e0e3187834097b550
-  data.tar.gz: 954ca1896cde21a38f37f5a8739e4d633adb82ca
+  metadata.gz: ad809b46c952fab2dde14ff9fa2076444fc3ca1f
+  data.tar.gz: 012e3cdd57292c29de4ec7b5b24592d8119e9b29
 SHA512:
-  metadata.gz: e289ce672d08483c6c8e5e29e471ad0e4a659546bcc4f5f1f0de8d14ca0a7229bafdafb45e9e2d91f9542df77b6231fd8bfdd4a2350e75cf447cab6197661822
-  data.tar.gz: a591e599f2457c1829f30e63abd955958fecdf7ec999d61269a7d6c6123c63588e7aa27a7cfa26ff350416b9a9a2cfdda07a833f32f2c529cbe998911e755c8e
+  metadata.gz: bb5d7c573f2727bb01dabb7bacfb91dced011bc721e82cc718504f2fc18f5a8884d9e04dd0328323f1ed7bd11670f1f0ae2765a8dda8a5e4cc9ebf672849b1cd
+  data.tar.gz: ea88f1bd43911acb79b3684d313aa3c76137fd18e7a38c4e8ffdaa47a85129dcfe0d19113967d470843a3f5fc9db9bda1ab13fff563a145908e9fc47ea20fecc

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.7.5](https://github.com/adhearsion/punchblock/compare/v2.7.4...v2.7.5) - [2015-08-27](https://rubygems.org/gems/punchblock/versions/2.7.5)
+  * Bugfix: Alternative fix for "Avoid race conditions in processing calls with interactions between them". The original fix in 2.7.4 introduced crashes relating to creating call actors at high call volume.
+
+# [v2.7.4](https://github.com/adhearsion/punchblock/compare/v2.7.3...v2.7.4) - [2015-08-19](https://rubygems.org/gems/punchblock/versions/2.7.4)
+  * YANKED
+  * Bugfix: Avoid race conditions in processing calls with interactions between them
+
 # [v2.7.3](https://github.com/adhearsion/punchblock/compare/v2.7.2...v2.7.3) - [2015-08-18](https://rubygems.org/gems/punchblock/versions/2.7.3)
   * Bugfix: Handle correct event for confirming that a component stop was completed on Asterisk 13
 

data/lib/punchblock/translator/asterisk.rb

@@ -18,7 +18,7 @@ module Punchblock
       autoload :Channel
       autoload :Component
 
-      attr_reader :ami_client, :connection, :calls, :bridges
+      attr_reader :ami_client, :connection, :calls
 
       REDIRECT_CONTEXT = 'adhearsion-redirect'
       REDIRECT_EXTENSION = '1'
@@ -83,10 +83,28 @@ module Punchblock
       def handle_ami_event(event)
         return unless event.is_a? RubyAMI::Event
 
-        if event.name == 'FullyBooted'
+        case event.name
+        when 'FullyBooted'
           handle_pb_event Connection::Connected.new
           run_at_fully_booted
           return
+        when 'BridgeEnter'
+          if other_channel = @bridges.delete(event['BridgeUniqueid'])
+            if event['OtherCall'] = call_for_channel(other_channel)
+              join_command = event['OtherCall'].pending_joins.delete event['Channel']
+              call = call_for_channel(event['Channel'])
+              join_command ||= call.pending_joins.delete other_channel if call
+              join_command.response = true if join_command
+            end
+          else
+            @bridges[event['BridgeUniqueid']] = event['Channel']
+          end
+        when 'BridgeLeave'
+          if other_channel = @bridges.delete(event['BridgeUniqueid'] + '_leave')
+            event['OtherCall'] = call_for_channel(other_channel)
+          else
+            @bridges[event['BridgeUniqueid'] + '_leave'] = event['Channel']
+          end
         end
 
         handle_varset_ami_event event

data/lib/punchblock/translator/asterisk/call.rb

@@ -137,34 +137,22 @@ module Punchblock
               send_pb_event Event::Ringing.new(timestamp: ami_event.best_time)
             end
           when 'BridgeEnter'
-            if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'])
-              if other_call = translator.call_for_channel(other_call_channel)
-                join_command   = @pending_joins.delete other_call_channel
-                join_command ||= other_call.pending_joins.delete channel
-                join_command.response = true if join_command
-
-                event = Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time
-                send_pb_event event
-
-                other_call_event = Event::Joined.new call_uri: id, timestamp: ami_event.best_time
-                other_call_event.target_call_id = other_call.id
-                translator.handle_pb_event other_call_event
-              end
-            else
-              translator.bridges[ami_event['BridgeUniqueid']] = ami_event['Channel']
+            if other_call = ami_event['OtherCall']
+              event = Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time
+              send_pb_event event
+
+              other_call_event = Event::Joined.new call_uri: id, timestamp: ami_event.best_time
+              other_call_event.target_call_id = other_call.id
+              translator.handle_pb_event other_call_event
             end
            when 'BridgeLeave'
-            if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'] + '_leave')
-              if other_call = translator.call_for_channel(other_call_channel)
-                event = Event::Unjoined.new call_uri: other_call.id, timestamp: ami_event.best_time
-                send_pb_event event
-
-                other_call_event = Event::Unjoined.new call_uri: id, timestamp: ami_event.best_time
-                other_call_event.target_call_id = other_call.id
-                translator.handle_pb_event other_call_event
-              end
-            else
-              translator.bridges[ami_event['BridgeUniqueid'] + '_leave'] = ami_event['Channel']
+            if other_call = ami_event['OtherCall']
+              event = Event::Unjoined.new call_uri: other_call.id, timestamp: ami_event.best_time
+              send_pb_event event
+
+              other_call_event = Event::Unjoined.new call_uri: id, timestamp: ami_event.best_time
+              other_call_event.target_call_id = other_call.id
+              translator.handle_pb_event other_call_event
             end
           when 'OriginateResponse'
             if ami_event['Response'] == 'Failure' && ami_event['Uniqueid'] == '<null>'

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "2.7.3"
+  VERSION = "2.7.5"
 end

data/spec/punchblock/translator/asterisk/call_spec.rb

@@ -818,13 +818,6 @@ module Punchblock
                 'Channel'  => call_channel
             end
 
-            context 'when the event is received the first time' do
-              it 'sets an entry in translator.bridges' do
-                subject.process_ami_event ami_event
-                expect(translator.bridges[bridge_uniqueid]).to eq call_channel
-              end
-            end
-
             context 'when the event is received a second time for the same BridgeUniqueid' do
               let(:other_channel) { 'SIP/5678-00000000' }
               let :other_call do
@@ -904,13 +897,6 @@ module Punchblock
                 'Channel'  => call_channel
             end
 
-            context 'when the event is received the first time' do
-              it 'sets an entry in translator.bridges' do
-                subject.process_ami_event ami_event
-                expect(translator.bridges[bridge_uniqueid + '_leave']).to eq call_channel
-              end
-            end
-
             context 'when the event is received a second time for the same BridgeUniqueid' do
               let(:other_channel) { 'SIP/5678-00000000' }
               let :other_call do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri