examples/gravatar.god in god-0.2.0 vs examples/gravatar.god in god-0.3.0

@@ -1,47 +1,41 @@
-# run with:  god start -c /path/to/gravatar.god
+# run with:  god -c /path/to/gravatar.god
 # 
 # This is the actual config file used to keep the mongrels of
 # gravatar.com running.
 
 RAILS_ROOT = "/var/www/gravatar2/current"
 
-God.meddle do |god|
-  %w{8200 8201 8202}.each do |port|
-    god.watch do |w|
-      w.name = "gravatar2-mongrel-#{port}"
-      w.interval = 30 # seconds
-      w.start = "mongrel_rails cluster::start --only #{port} \
-        -C #{RAILS_ROOT}/config/mongrel_cluster.yml"
-      w.stop = "mongrel_rails cluster::stop --only #{port} \
-        -C #{RAILS_ROOT}/config/mongrel_cluster.yml"
-      w.grace = 10 # seconds
-      
-      pid_file = File.join(RAILS_ROOT, "log/mongrel.#{port}.pid")
-      
-      w.behavior(:clean_pid_file) do |b|
-        b.pid_file = pid_file
-      end
+%w{8200 8201 8202}.each do |port|
+  God.watch do |w|
+    w.name = "gravatar2-mongrel-#{port}"
+    w.interval = 30 # seconds
+    w.start = "mongrel_rails cluster::start --only #{port} \
+      -C #{RAILS_ROOT}/config/mongrel_cluster.yml"
+    w.stop = "mongrel_rails cluster::stop --only #{port} \
+      -C #{RAILS_ROOT}/config/mongrel_cluster.yml"
+    w.grace = 10 # seconds
+    
+    pid_file = File.join(RAILS_ROOT, "log/mongrel.#{port}.pid")
+    
+    w.behavior(:clean_pid_file)
 
-      w.start_if do |start|
-        start.condition(:process_not_running) do |c|
-          c.interval = 5 # seconds
-          c.pid_file = pid_file
-        end
+    w.start_if do |start|
+      start.condition(:process_running) do |c|
+        c.interval = 5 # seconds
+        c.running = false
       end
-      
-      w.restart_if do |restart|
-        restart.condition(:memory_usage) do |c|
-          c.pid_file = pid_file
-          c.above = (150 * 1024) # 150mb
-          c.times = [3, 5] # 3 out of 5 intervals
-        end
-      
-        restart.condition(:cpu_usage) do |c|
-          c.pid_file = pid_file
-          c.above = 50 # percent
-          c.times = 5
-        end
+    end
+    
+    w.restart_if do |restart|
+      restart.condition(:memory_usage) do |c|
+        c.above = (150 * 1024) # 150mb
+        c.times = [3, 5] # 3 out of 5 intervals
+      end
+    
+      restart.condition(:cpu_usage) do |c|
+        c.above = 50 # percent
+        c.times = 5
       end
     end
   end
 end
\ No newline at end of file