Merge branch 'feature/dtmf_recognizer_leak' into develop

adhearsion · Mar 24, 2014 · ec30430 · ec30430
2 parents c6d3089 + afb3c6b
commit ec30430
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # [develop](https://github.com/adhearsion/punchblock)
+  * Bugfix: Ensure DTMF recognisers get shut down when finishing
 
 # [v2.5.0](https://github.com/adhearsion/punchblock/compare/v2.4.2...v2.5.0) - [2014-03-05](https://rubygems.org/gems/punchblock/versions/2.5.0)
   * Feature: Support language, sensitivity and minimum confidence on UniMRCP-based ASR on Asterisk

diff --git a/lib/punchblock/translator/dtmf_recognizer.rb b/lib/punchblock/translator/dtmf_recognizer.rb
@@ -122,6 +122,7 @@ def finalize(match_type, match = nil)
           @responder.send match_type
         end
         @finished = true
+        terminate
       end
     end
   end

diff --git a/spec/punchblock/translator/asterisk/component/input_spec.rb b/spec/punchblock/translator/asterisk/component/input_spec.rb
@@ -99,6 +99,10 @@ def send_ami_events_for_dtmf(digit)
                   subject.should_receive(:process_dtmf).never
                   send_ami_events_for_dtmf 3
                 end
+
+                it "should not leave the recognizer running" do
+                  Celluloid::Actor.all.map { |a| a.class }.should_not include(Punchblock::Translator::DTMFRecognizer)
+                end
               end
 
               context "when the match is invalid" do
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,6 +122,7 @@ def finalize(match_type, match = nil) @@
               @responder.send match_type
             end
             @finished = true
+            terminate
           end
         end
       end
@@ Expand Down @@