lib/adhearsion/xmpp/connection.rb in adhearsion-xmpp-1.0.1 vs lib/adhearsion/xmpp/connection.rb in adhearsion-xmpp-1.0.2

@@ -9,19 +9,36 @@
 
       def initialize
         Blather.logger = logger
         Blather.default_log_level = :trace if Blather.respond_to? :default_log_level
         register_default_client_handlers
+        @shutting_down = false
         Adhearsion::Events.after_initialized { connect }
-        Adhearsion::Events.shutdown { shutdown }
+        Adhearsion::Events.shutdown do
+          @shutting_down = true
+          shutdown
+        end
       end
 
       private
 
       def connect
-        logger.info "Connecting to XMPP"
         Adhearsion::Process.important_threads << Thread.new do
-          EventMachine.run { client.connect }
+          begin
+            until @shutting_down
+              logger.info "Connecting to XMPP"
+              EventMachine.run { client.connect }
+              logger.info "XMPP connection closed"
+            end
+          rescue Blather::Stream::ConnectionFailed
+            reconnect_timer = Adhearsion.config.punchblock.reconnect_timer
+            logger.error "XMPP connection failed. Retrying connection in #{reconnect_timer}s"
+            sleep reconnect_timer
+            retry
+          rescue => e
+            logger.fatal e
+            raise
+          end
         end
       end
 
       def register_default_client_handlers
         client.register_handler(:ready) do