Skip to content

Commit

Permalink
Revert "Merge pull request AppScale#859 from nlake44/channel-secret-fix"
Browse files Browse the repository at this point in the history
This reverts commit 553892c, reversing
changes made to 60c5d9c.
  • Loading branch information
root committed Jan 23, 2014
1 parent 4f1857e commit d73b048
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 @@ -5230,7 +5230,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 d73b048

Please sign in to comment.