Skip to content

Commit

Permalink
Merge pull request #1723 from menivaitsi/djinn-match
Browse files Browse the repository at this point in the history
Fixing AppController match command in monit.
  • Loading branch information
nlake44 committed Apr 22, 2015
2 parents ca3aad6 + ce0753d commit 77d6add
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion AppController/djinn.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4033,6 +4033,7 @@ def start_appcontroller(node)
}
start = "/usr/sbin/service appscale-controller start"
stop = "/usr/sbin/service appscale-controller stop"
match = "/usr/bin/ruby -w /root/appscale/AppController/djinnServer.rb"

# remove any possible appcontroller state that may not have been
# properly removed in non-cloud runs
Expand All @@ -4043,7 +4044,7 @@ def start_appcontroller(node)
Kernel.sleep(1)

begin
MonitInterface.start(:controller, start, stop, SERVER_PORT, env, ip, ssh_key)
MonitInterface.start(:controller, start, stop, SERVER_PORT, env, ip, ssh_key, match)
HelperFunctions.sleep_until_port_is_open(ip, SERVER_PORT, USE_SSL, 60)
rescue Exception => except
backtrace = except.backtrace.join("\n")
Expand Down

0 comments on commit 77d6add

Please sign in to comment.