lib/adhearsion/voip/asterisk/commands.rb in adhearsion-0.8.5 vs lib/adhearsion/voip/asterisk/commands.rb in adhearsion-0.8.6

@@ -49,16 +49,37 @@
         end
 
         # Utility method to read from pbx. Hangup if nil.
         def read
           returning from_pbx.gets do |message|
-            ahn_log.agi.debug "<<< #{message}"
             # AGI has many conditions that might indicate a hangup
             raise Hangup if message.nil?
-            raise Hangup if message.match(/^HANGUP\n?$/i)
-            raise Hangup if message.match(/^HANGUP\s?\d{3}/i)
-            raise Hangup if message.match(/^511 Command Not Permitted on a dead channel/i)
+
+            ahn_log.agi.debug "<<< #{message}"
+
+            code, rest = *message.split(' ', 2)
+    
+            if code == "511"
+              # '511' Command Not Permitted on a dead channel
+              ahn_log.agi.debug "AGI 500 error. Raising hangup"
+              raise Hangup
+            end
+
+            if (500..599) === code.to_i
+              # 500 AGI protocol error.  Catches (at least):
+              # 520 Invalid command syntax.
+              # 510 Invalid or unknown command
+              # If we have hit this then something bad has happened.
+              ahn_log.agi.warn "AGI 500 error encountered.  This may be a bug in Adhearsion.  Please report it at http://adhearsion.lighthouseapp.com"
+            end
+
+            # If the message starts with HANGUP it's a silly 1.6 OOB message
+            case message
+            when /^HANGUP/, /^HANGUP\n?$/i, /^HANGUP\s?\d{3}/i
+              ahn_log.agi.debug "AGI HANGUP. Raising hangup"
+              raise Hangup
+            end
           end
         end
 
         # The underlying method executed by nearly all the command methods in this module.
         # Used to send the plaintext commands in the proper AGI format over TCP/IP back to an Asterisk server via the
@@ -201,10 +222,10 @@
 
           if (!options.has_key?(:format))
             format = filename.slice!(/\.[^\.]+$/)
             if (format.nil?)
               ahn_log.agi.warn "Format not specified and not detected.  Defaulting to \"gsm\""
-              format = gsm
+              format = "gsm"
             end
             format.sub!(/^\./, "")
           else
             format = options.delete(:format)
           end