From fedeefef980213dfe40af772a5b204de577165a8 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 4 Mar 2012 10:04:41 -0500 Subject: [PATCH] more redis and resque stuff --- rails/map-mash/.gitignore | 1 + rails/map-mash/Gemfile | 3 ++- rails/map-mash/Gemfile.lock | 6 ++++-- rails/map-mash/Procfile | 4 ++-- rails/map-mash/config/environment.rb | 2 +- rails/map-mash/config/initializers/01-settings.rb | 6 ++++++ rails/map-mash/config/initializers/redis_conf.rb | 8 ++++++++ rails/map-mash/config/{redis.conf => redis.conf.erb} | 2 +- rails/map-mash/config/settings/default.yml | 5 +++++ rails/map-mash/script/resque-web-runner | 5 +++++ 10 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 rails/map-mash/config/initializers/01-settings.rb create mode 100644 rails/map-mash/config/initializers/redis_conf.rb rename rails/map-mash/config/{redis.conf => redis.conf.erb} (99%) create mode 100644 rails/map-mash/config/settings/default.yml create mode 100755 rails/map-mash/script/resque-web-runner diff --git a/rails/map-mash/.gitignore b/rails/map-mash/.gitignore index cb82058..de19c29 100644 --- a/rails/map-mash/.gitignore +++ b/rails/map-mash/.gitignore @@ -1,3 +1,4 @@ log/*.log tmp/* db/*.sqlite3 +config/redis.conf diff --git a/rails/map-mash/Gemfile b/rails/map-mash/Gemfile index 11dc4e6..96b8951 100644 --- a/rails/map-mash/Gemfile +++ b/rails/map-mash/Gemfile @@ -4,8 +4,8 @@ gem 'rails', '2.3.2' gem 'active_presenter', '1.2.1' gem 'activesupport', '2.3.2' gem 'awesome_print', '0.2.1', :require => 'ap' +gem 'mc-settings' gem 'mongrel', '1.1.5' -gem 'mysql', '2.8.1' gem 'nokogiri', '1.4.3.1' gem 'rack', '1.2.1' gem 'rake', '0.8.7' @@ -18,6 +18,7 @@ gem 'resque-loner', '1.0.1' gem 'resque-scheduler', '2.0.0.d' gem 'rmagick', '2.13.1' gem 'ruby-debug', '0.10.3' +gem 'sqlite3' gem 'typhoeus', '0.2.4' gem 'unicorn', '3.7.0' gem 'uuid', '2.3.3' diff --git a/rails/map-mash/Gemfile.lock b/rails/map-mash/Gemfile.lock index 4396828..0749f74 100644 --- a/rails/map-mash/Gemfile.lock +++ b/rails/map-mash/Gemfile.lock @@ -53,6 +53,7 @@ GEM macaddr (1.5.0) systemu (>= 2.4.0) machinist (1.0.6) + mc-settings (0.1.6) method_source (0.7.1) mime-types (1.17.2) mongrel (1.1.5) @@ -61,7 +62,6 @@ GEM fastthread (>= 1.0.1) gem_plugin (>= 0.2.3) multi_json (1.0.4) - mysql (2.8.1) nokogiri (1.4.3.1) pry (0.8.3) coderay (>= 0.9.7) @@ -133,6 +133,7 @@ GEM rack (~> 1.1) tilt (>= 1.2.2, < 2.0) slop (2.4.2) + sqlite3 (1.3.5) systemu (2.4.2) term-ansicolor (1.0.7) thor (0.14.6) @@ -168,8 +169,8 @@ DEPENDENCIES guard-livereload launchy (= 0.3.7) machinist (= 1.0.6) + mc-settings mongrel (= 1.1.5) - mysql (= 2.8.1) nokogiri (= 1.4.3.1) pry rack (= 1.2.1) @@ -192,6 +193,7 @@ DEPENDENCIES ruby-debug-ide ruby-prof (= 0.9.2) sanitize + sqlite3 typhoeus (= 0.2.4) unicorn (= 3.7.0) uuid (= 2.3.3) diff --git a/rails/map-mash/Procfile b/rails/map-mash/Procfile index e426ad2..83722ed 100644 --- a/rails/map-mash/Procfile +++ b/rails/map-mash/Procfile @@ -1,3 +1,3 @@ rails_server: bundle exec script/server -resque_web: bundle exec resque-web --foreground --no-launch -redis: bundle exec redis-server config/redis.conf +resque_web: bundle exec script/resque-web-runner +redis: bundle exec script/redis-runner diff --git a/rails/map-mash/config/environment.rb b/rails/map-mash/config/environment.rb index ff450c7..631a3a3 100644 --- a/rails/map-mash/config/environment.rb +++ b/rails/map-mash/config/environment.rb @@ -38,4 +38,4 @@ Rails::Initializer.run do |config| # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] # config.i18n.default_locale = :de -end \ No newline at end of file +end diff --git a/rails/map-mash/config/initializers/01-settings.rb b/rails/map-mash/config/initializers/01-settings.rb new file mode 100644 index 0000000..05564e0 --- /dev/null +++ b/rails/map-mash/config/initializers/01-settings.rb @@ -0,0 +1,6 @@ +require 'mc-settings' + +Setting.load( + :path => Rails.root, + :files => ['config/settings/default.yml'] +) diff --git a/rails/map-mash/config/initializers/redis_conf.rb b/rails/map-mash/config/initializers/redis_conf.rb new file mode 100644 index 0000000..49fa692 --- /dev/null +++ b/rails/map-mash/config/initializers/redis_conf.rb @@ -0,0 +1,8 @@ +require 'erb' + +File.open(Rails.root.join('config/redis.conf.erb'), 'r') do |f| + tmpl = ERB.new(f.read) + File.open(Rails.root.join('config/redis.conf'), 'w') do |conf| + conf.write(tmpl.result(binding)) + end +end diff --git a/rails/map-mash/config/redis.conf b/rails/map-mash/config/redis.conf.erb similarity index 99% rename from rails/map-mash/config/redis.conf rename to rails/map-mash/config/redis.conf.erb index be1131c..5d9c27a 100644 --- a/rails/map-mash/config/redis.conf +++ b/rails/map-mash/config/redis.conf.erb @@ -22,7 +22,7 @@ pidfile /tmp/rails-map-mash-redis/server.pid # Accept connections on the specified port, default is 6379. # If port 0 is specified Redis will not listen on a TCP socket. -port 16379 +port <%= Setting.redis(:port) %> # If you want you can bind a single interface, if the bind option is not # specified all the interfaces will listen for incoming connections. diff --git a/rails/map-mash/config/settings/default.yml b/rails/map-mash/config/settings/default.yml new file mode 100644 index 0000000..7af3cff --- /dev/null +++ b/rails/map-mash/config/settings/default.yml @@ -0,0 +1,5 @@ +resque_web: + port: 15678 + +redis: + port: 16379 diff --git a/rails/map-mash/script/resque-web-runner b/rails/map-mash/script/resque-web-runner new file mode 100755 index 0000000..0196d14 --- /dev/null +++ b/rails/map-mash/script/resque-web-runner @@ -0,0 +1,5 @@ +#!/bin/bash +exec ruby <