From 17fbbd8e7a55a417565e52f24dd977d6dc53455b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 30 Apr 2014 13:40:11 -0700 Subject: [PATCH 1/2] separate requirement for site, site_thumbnails and site_screenshots --- .gitignore | 2 ++ public/site_screenshots/.gitignore | 1 - public/sites/.gitignore | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 public/site_screenshots/.gitignore delete mode 100644 public/sites/.gitignore diff --git a/.gitignore b/.gitignore index a240e12d..06044c8d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ config.yml .DS_Store public/assets/css/.sass-cache/ public/site_thumbnails +public/sites +public/site_screenshots diff --git a/public/site_screenshots/.gitignore b/public/site_screenshots/.gitignore deleted file mode 100644 index 72e8ffc0..00000000 --- a/public/site_screenshots/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/public/sites/.gitignore b/public/sites/.gitignore deleted file mode 100644 index 72e8ffc0..00000000 --- a/public/sites/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* From 6bb59ffbf29f71549036161e3ac550380efa07c3 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 30 Apr 2014 14:34:58 -0700 Subject: [PATCH 2/2] allow for url config for sidekiq --- environment.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/environment.rb b/environment.rb index 22654ad9..438c3f06 100644 --- a/environment.rb +++ b/environment.rb @@ -37,12 +37,15 @@ end Sidekiq::Logging.logger = nil unless ENV['RACK_ENV'] == 'production' +sidekiq_redis_config = {namespace: 'neocitiesworker'} +sidekiq_redis_config[:url] = $config['sidekiq_url'] if $config['sidekiq_url'] + Sidekiq.configure_server do |config| - config.redis = { namespace: 'neocitiesworker' } + config.redis = sidekiq_redis_config end Sidekiq.configure_client do |config| - config.redis = { namespace: 'neocitiesworker' } + config.redis = sidekiq_redis_config end require File.join(DIR_ROOT, 'workers', 'thumbnail_worker.rb')