8000 Passing flower password from tools to flower by shatterednirvana · Pull Request #864 · AppScale/gts · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Passing flower password from tools to flower #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2014
Merged

Passing flower password from tools to flower #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AppController/djinn.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3304,7 +3304,7 @@ def change_job()
maybe_start_taskqueue_worker("apichecker")

if my_node.is_login?
TaskQueue.start_flower()
TaskQueue.start_flower(@creds['flower_password'])
end

# appengine is started elsewhere
Expand Down
7 changes: 5 additions & 2 deletions AppController/lib/taskqueue.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,11 @@ def self.erase_local_files()
# Starts the Flower Server on this machine, which provides a web UI to celery
# and RabbitMQ. A link to Flower is given in the AppDashboard, for users to
# monitor their Task Queue tasks.
def self.start_flower()
start_cmd = "/usr/local/bin/flower --basic_auth=appscale:appscale"
#
# Args:
# flower_password: A String that is used as the password to log into flower.
def self.start_flower(flower_password)
start_cmd = "/usr/local/bin/flower --basic_auth=appscale:#{flower_password}"
stop_cmd = "/bin/ps ax | /bin/grep flower | /bin/grep -v grep | /usr/bin/awk '{print $1}' | xargs kill -9"
MonitInterface.start(:flower, start_cmd, stop_cmd, FLOWER_SERVER_PORT)
end
Expand Down
0