Merge pull request #926 from aw/fix-xmpp-muc

Fix xmpp-muc service
github · Sep 2, 2014 · 8765dd6 · 8765dd6
2 parents a6bbec4 + a38cea1
commit 8765dd6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/services/xmpp_muc.rb b/lib/services/xmpp_muc.rb
@@ -84,15 +84,15 @@ def setup_muc_connection
           @client.auth(@data['password'])
           ::Jabber::debug = true
           @muc = ::Jabber::MUC::MUCClient.new(@client)
-          @muc.join(::Jabber::JID.new(@data['muc_room']), @data['password'])
+          @muc.join(::Jabber::JID.new(@data['muc_room']), @data['room_password'])
         rescue ::Jabber::ErrorResponse
           raise_config_error 'Error response'
         rescue ::Jabber::ClientAuthenticationFailure
           raise_config_error 'Authentication error'
         rescue ::Jabber::JabberError
-          raise_config_error 'XMPP Error: #{$!.to_s}'
-        else
-          raise_config_error 'Unknown error: #{$!.to_s}'
+          raise_config_error "XMPP Error: #{$!.to_s}"
+        rescue StandardError => e
+          raise_config_error "Unknown error: #{$!.to_s}"
         end
       end
       @muc