From dd607fb47d96795a0cb74a9337a952a30d3f4e2d Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sun, 29 May 2011 16:11:29 +0200 Subject: [PATCH] user can now disable thin and use ./script/server to fire up resque and websocket only --- config/script_server_config.yml.example | 5 ++++- script/server | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/script_server_config.yml.example b/config/script_server_config.yml.example index 2a6de73cf..d90b29b17 100644 --- a/config/script_server_config.yml.example +++ b/config/script_server_config.yml.example @@ -1,4 +1,7 @@ script_server: + # Enable thin as application server + enable_thin: true + # Port on which thin should listen thin_port: 3000 @@ -6,4 +9,4 @@ script_server: default_thin_args: "-p $THIN_PORT -e $RAILS_ENV" # Possibilities are development, production - rails_env: "development" \ No newline at end of file + rails_env: "development" diff --git a/script/server b/script/server index e51462fb7..65dbcc0c3 100755 --- a/script/server +++ b/script/server @@ -173,4 +173,7 @@ if [ "$(./script/get_config.rb single_process_mode $RAILS_ENV)" = "false" ]; the bundle exec ruby ./script/websocket_server.rb& fi -bundle exec thin start $args + +if [ "$(./script/get_config.rb enable_thin script_server)" = "true"]; then + bundle exec thin start $args +fi