@@ -3,7 +3,6 @@ Manifest.txt README.txt Rakefile bin/god -bin/god-check examples/events.god examples/gravatar.god examples/single.god @@ -15,6 +14,9 @@ lib/god.rb lib/god/behavior.rb lib/god/behaviors/clean_pid_file.rb lib/god/behaviors/notify_when_flapping.rb +lib/god/cli/command.rb +lib/god/cli/run.rb +lib/god/cli/version.rb lib/god/condition.rb lib/god/conditions/always.rb lib/god/conditions/complex.rb Manifest.txt @@ -34,6 +34,7 @@ begin status show status of each task quit stop god terminate stop god and all tasks + check run self diagnostic Options: EOF bin/god @@ -7,7 +7,6 @@ module God @options = options @args = args - setup dispatch end @@ -27,9 +26,13 @@ module God def dispatch if %w{load status log quit terminate}.include?(@command) + setup send("#{@command}_command") elsif %w{start stop restart monitor unmonitor}.include?(@command) + setup lifecycle_command + elsif @command == 'check' + check_command else puts "Command '#{@command}' is not valid. Run 'god --help' for usage" abort @@ -114,6 +117,50 @@ module God end end + def check_command + Thread.new do + begin + event_system = God::EventHandler.event_system + puts "using event system: #{event_system}" + + if God::EventHandler.loaded? + puts "starting event handler" + God::EventHandler.start + else + puts "[fail] event system did not load" + exit(1) + end + + puts 'forking off new process' + + pid = fork do + loop { sleep(1) } + end + + puts "forked process with pid = #{pid}" + + God::EventHandler.register(pid, :proc_exit) do + puts "[ok] process exit event received" + exit(0) + end + + sleep(1) + + puts "killing process" + + ::Process.kill('KILL', pid) + rescue => e + puts e.message + puts e.backtrace.join("\n") + end + end + + sleep(2) + + puts "[fail] never received process exit event" + exit(1) + end + def lifecycle_command # get the name of the watch/group name = @args[1] lib/god/cli/command.rb bin/god-check 745c9b3835a07cccb936174cbf607235c69a4fcb Tom Preston-Werner tom@mojombo.com http://github.com/mojombo/god/commit/8906e12ccb19310d9bc7936e1f33ae7a475f11be 8906e12ccb19310d9bc7936e1f33ae7a475f11be 2007-11-11T22:06:24-08:00 2007-11-11T22:06:24-08:00 add god check to binary 18bcc25902f7b9872cb822ca60770183e99fbcfe Tom Preston-Werner tom@mojombo.com