Merge pull request #7 from longnguyen11288/master

Added support to thin to have specify number of thin workers
sm · Mar 21, 2012 · 8536360 · 8536360
2 parents 77cc519 + 6d6172b
commit 8536360
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 26 deletions.
diff --git a/thin/bin/restart b/thin/bin/restart
@@ -1,18 +1,11 @@
 #!/bin/sh
 
-if user is root
-then
-  log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
 exec thin restart  \
   --address 0.0.0.0  \
   --environment ${environment}    \
   --chdir "$HOME/active/${project}"  \
   --log "$HOME/shared/log/${environment}.log"    \
   --tag ${project}:${environment}  \
-  --port ${port} -s2    \
-  --pid /var/run/${project}/thin.pid
+  --port ${port} -s${thin_worker}    \
+  --pid "$HOME/shared/pids/${project}.pid"
 
diff --git a/thin/bin/start b/thin/bin/start
@@ -1,18 +1,11 @@
 #!/bin/sh
 
-if user is root
-then
-  log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
 exec thin start  \
   --address 0.0.0.0  \
   --environment ${environment}    \
   --chdir "$HOME/active/${project}"  \
   --log "$HOME/shared/log/${environment}.log"    \
   --tag ${project}:${environment}  \
-  --port ${port} -s2    \
+  --port ${port} -s${thin_worker}    \
   --pid "$HOME/shared/pids/${project}.pid"
 
diff --git a/thin/bin/stop b/thin/bin/stop
@@ -1,18 +1,11 @@
 #!/bin/sh
 
-if user is root
-then
-  log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
 exec thin stop  \
   --address 0.0.0.0  \
   --environment ${environment}    \
   --chdir "$HOME/active/${project}"  \
   --log "$HOME/shared/log/${environment}.log"    \
   --tag ${project}:${environment}  \
-  --port ${port} -s2    \
-  --pid /var/run/${project}/thin.pid
+  --port ${port} -s${thin_worker}    \
+  --pid "$HOME/shared/pids/${project}.pid"
 
diff --git a/thin/shell/includes b/thin/shell/includes
@@ -1 +1,2 @@
 api/user
+api/variables
diff --git a/thin/shell/initialize b/thin/shell/initialize
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if user is root
+then
+  log error "Thin ${action} may be run only as a non-root user."
+fi
+
+if variable is empty thin_worker
+then
+  export thin_worker=2
+fi
+
+source "$HOME/.env" # This file should load the ruby environment & define 'port'