seesaw 0.2.2 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.txt +4 -0
- data/README.txt +10 -0
- data/lib/seesaw/init.rb +6 -2
- metadata +1 -1
data/History.txt
CHANGED
data/README.txt
CHANGED
@@ -55,6 +55,16 @@ The seesaw configuration looks like this:
|
|
55
55
|
|
56
56
|
=== Nginx
|
57
57
|
|
58
|
+
---
|
59
|
+
restart_cmd: sudo kill -HUP `cat /opt/local/nginx/logs/nginx.pid`
|
60
|
+
config_symlink: cluster.conf
|
61
|
+
mongrel_config_file: config/mongrel_cluster.yml
|
62
|
+
config_path: /opt/local/nginx/conf/cluster
|
63
|
+
config_files:
|
64
|
+
all: cluster_all.conf
|
65
|
+
1: cluster_1.conf
|
66
|
+
2: cluster_2.conf
|
67
|
+
symlink_cmd: ln -sf
|
58
68
|
|
59
69
|
=== Apache
|
60
70
|
|
data/lib/seesaw/init.rb
CHANGED
@@ -6,7 +6,7 @@ require 'seesaw/mongrel_cluster_patch'
|
|
6
6
|
require "erb"
|
7
7
|
|
8
8
|
module Seesaw
|
9
|
-
VERSION = '0.2.
|
9
|
+
VERSION = '0.2.3'
|
10
10
|
|
11
11
|
module CommandBase
|
12
12
|
|
@@ -30,6 +30,7 @@ module Seesaw
|
|
30
30
|
log "start mongrels #{cluster}"
|
31
31
|
cmd = "mongrel_rails seesaw::start"
|
32
32
|
cmd << " --cluster #{cluster}" if cluster && cluster != "all"
|
33
|
+
cmd << " -C #{@options["mongrel_config_file"]}" if @options["mongrel_config_file"]
|
33
34
|
system(cmd)
|
34
35
|
end
|
35
36
|
|
@@ -37,6 +38,7 @@ module Seesaw
|
|
37
38
|
log "stop mongrels #{cluster}"
|
38
39
|
cmd = "mongrel_rails seesaw::stop"
|
39
40
|
cmd << " --cluster #{cluster}" if cluster
|
41
|
+
cmd << " -C #{@options["mongrel_config_file"]}" if @options["mongrel_config_file"]
|
40
42
|
system(cmd)
|
41
43
|
end
|
42
44
|
|
@@ -180,13 +182,15 @@ module Seesaw
|
|
180
182
|
@options = {}
|
181
183
|
|
182
184
|
@options["config_path"] = @http_config_path
|
185
|
+
@options["mongrel_config_path"] = @mongrel_config_file
|
183
186
|
@options["restart_cmd"] = restart_cmds[@server]
|
184
187
|
@options["symlink_cmd"] = "ln -sf"
|
185
188
|
@options["config_symlink"] = "cluster.conf"
|
186
189
|
@options["config_files"] = {}
|
187
190
|
@options["config_files"]["all"] = "cluster_all.conf"
|
188
191
|
@options["config_files"][1] = "cluster_1.conf"
|
189
|
-
@options["config_files"][2] = "cluster_2.conf"
|
192
|
+
@options["config_files"][2] = "cluster_2.conf"
|
193
|
+
|
190
194
|
|
191
195
|
# write seesaw configuration
|
192
196
|
log "Writing configuration file to #{@config_file}."
|