adhearsion 0.8.5 → 0.8.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.8.6
+ - Fix packaging problem so all files are publicly readable
+ - Improve AMI reconnecting logic; add "connection refused" retry timer
+ - AGI protocol improvements: parse the status code and response text
+
 0.8.5
  - Added XMPP module and sample component. This allows you to easily write components which utilise a persistent XMPP connection maintained by Adhearsion
  - Prefer finding the dialplan.rb entry point by the AGI request URI instead of the calling context

data/adhearsion.gemspec

@@ -117,7 +117,7 @@ ADHEARSION_FILES = %w{
 
 Gem::Specification.new do |s|
   s.name = "adhearsion"
-  s.version = "0.8.5"
+  s.version = Adhearsion::VERSION::STRING
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Phillips", "Jason Goecke", "Ben Klang"]
@@ -129,7 +129,7 @@ Gem::Specification.new do |s|
 
   s.files = ADHEARSION_FILES
 
-  s.has_rdoc = false
+  s.has_rdoc = true
   s.homepage = "http://adhearsion.com"
   s.require_paths = ["lib"]
   s.rubyforge_project = "adhearsion"

data/lib/adhearsion/foundation/event_socket.rb

@@ -144,6 +144,7 @@ class EventSocket
   def connection_dropped!
     @state_lock.synchronize do
       unless @state.equal? :connection_dropped
+        @socket.close rescue nil
         @state = :connection_dropped
         @handler.disconnected
       end

data/lib/adhearsion/initializer.rb

@@ -151,7 +151,7 @@ module Adhearsion
       load_components
       init_events_file
 
-      ahn_log "Adhearsion initialized!"
+      ahn_log "Adhearsion v#{Adhearsion::VERSION::STRING} initialized!"
       Adhearsion.status = :running
 
       trigger_after_initialized_hooks

data/lib/adhearsion/initializer/configuration.rb

@@ -129,8 +129,8 @@ module Adhearsion
       end
 
       def initialize(overrides = {})
-        @listening_port = overrides.has_key?(:port) ? overrides[:port] : self.class.default_listening_port
-        @listening_host = overrides.has_key?(:host) ? overrides[:host] : self.class.default_listening_host
+        @listening_port = overrides.has_key?(:port) ? overrides.delete(:port) : self.class.default_listening_port
+        @listening_host = overrides.has_key?(:host) ? overrides.delete(:host) : self.class.default_listening_host
         super
       end
     end

data/lib/adhearsion/version.rb

@@ -2,7 +2,7 @@ module Adhearsion #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0 unless defined? MAJOR
     MINOR = 8 unless defined? MINOR
-    TINY  = 5 unless defined? TINY
+    TINY  = 6 unless defined? TINY
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined? STRING
   end

data/lib/adhearsion/voip/asterisk/commands.rb

@@ -51,12 +51,33 @@ module Adhearsion
         # 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
 
@@ -203,7 +224,7 @@ module Adhearsion
             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

data/lib/adhearsion/voip/asterisk/manager_interface.rb

@@ -33,6 +33,8 @@ module Adhearsion
                                   dahdishowchannels coreshowchannels dbget
                                   status konferencelist] unless defined? CAUSAL_EVENT_NAMES
 
+          RETRY_SLEEP = 5
+
           class << self
 
             def connect(*args)
@@ -262,11 +264,11 @@ module Adhearsion
           def clear_actions_connection
             stop_actions_writer_loop
             clear_actions_connection_resources
-            disconnect_actions_connection
+            disconnect_actions_connection if @actions_state.equal? :connected
           end
 
           def clear_events_connection
-            disconnect_events_connection
+            disconnect_events_connection if @events_state.equal? :connected
           end
 
           def disconnect!
@@ -543,6 +545,10 @@ module Adhearsion
               handler.disconnected { actions_connection_disconnected }
             end
             login_actions
+          rescue Errno::ECONNREFUSED => e
+            ahn_log.ami.warn "ACTIONS thread connection refused!   Retrying in #{RETRY_SLEEP} seconds..."
+            sleep RETRY_SLEEP
+            retry
           end
 
           def disconnect_actions_connection
@@ -569,6 +575,10 @@ module Adhearsion
             end
             login_events
             ahn_log.ami "Successful AMI events-only connection into #{@username}@#{@host}"
+          rescue Errno::ECONNREFUSED => e
+            ahn_log.ami.warn "EVENTS thread connection refused!  Retrying in #{RETRY_SLEEP} seconds..."
+            sleep RETRY_SLEEP
+            retry
           end
 
           def login_actions

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Jay Phillips
@@ -193,7 +193,7 @@ files:
 - lib/theatre/version.rb
 - LICENSE
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://adhearsion.com
 licenses: []