Skip to content

Commit

Permalink
Merge pull request #859 from nlake44/channel-secret-fix
Browse files Browse the repository at this point in the history
Fix channel API for when the appscale secret changes.
  • Loading branch information
Tyler Krebs committed Jan 22, 2014
2 parents 60c5d9c + 27e4ba6 commit 553892c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion AppController/djinn.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5221,7 +5221,7 @@ def start_xmpp_for_app(app, port, app_language)
xmpp_pass = HelperFunctions.encrypt_password(xmpp_user, @@secret)
result = uac.commit_new_user(xmpp_user, xmpp_pass, "app")
Djinn.log_debug("User creation returned: #{result}")
if result.include? 'Error: user already exists'
if result.include?('Error: user already exists')
# We need to update the password of the channel XMPP account for
# authorization.
result = uac.change_password(xmpp_user, xmpp_pass)
Expand Down

0 comments on commit 553892c

Please sign in to comment.