0
@@ -1,6 +1,6 @@
0
 # == God config file
0
 # http://god.rubyforge.org/
0
-# Author: Gump
0
+# Authors: Gump and michael@glauche.de
0
 #
0
 # Config file for god that configures watches for each instance of a thin server for
0
 # each thin configuration file found in /etc/thin.
0
0
0
0
0
0
@@ -16,28 +16,32 @@
0
   config = YAML.load_file(file)
0
   num_servers = config["servers"] ||= 1
0
 
0
-  for i in 0...num_servers
0
+  (0...num_servers).each do |i|
0
+    # UNIX socket cluster use number 0 to 2 (for 3 servers)
0
+    # and tcp cluster use port number 3000 to 3002.
0
+    number = config['socket'] ? i : (config['port'] + i)
0
+    
0
     God.watch do |w|
0
       w.group = "thin-" + File.basename(file, ".yml")
0
-      w.name = w.group + "-#{i}"
0
+      w.name = w.group + "-#{number}"
0
       
0
       w.interval = 30.seconds
0
       
0
       w.uid = config["user"]
0
       w.gid = config["group"]
0
       
0
-      w.start = "thin start -C #{file} -o #{i}"
0
+      w.start = "thin start -C #{file} -o #{number}"
0
       w.start_grace = 10.seconds
0
       
0
-      w.stop = "thin stop -C #{file} -o #{i}"
0
+      w.stop = "thin stop -C #{file} -o #{number}"
0
       w.stop_grace = 10.seconds
0
       
0
-      w.restart = "thin restart -C #{file} -o #{i}"
0
+      w.restart = "thin restart -C #{file} -o #{number}"
0
 
0
       pid_path = config["chdir"] + "/" + config["pid"]
0
       ext = File.extname(pid_path)
0
 
0
-      w.pid_file = pid_path.gsub(/#{ext}$/, ".#{i}#{ext}")
0
+      w.pid_file = pid_path.gsub(/#{ext}$/, ".#{number}#{ext}")
0
       
0
       w.behavior(:clean_pid_file)
0