diff --git a/AppController/djinn.rb b/AppController/djinn.rb index b9daa25b97..217d533fed 100644 --- a/AppController/djinn.rb +++ b/AppController/djinn.rb @@ -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 diff --git a/AppController/lib/taskqueue.rb b/AppController/lib/taskqueue.rb index 5cdf0bf822..d9b6db4d0d 100644 --- a/AppController/lib/taskqueue.rb +++ b/AppController/lib/taskqueue.rb @@ -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