From 1a8aa9ae03e1bc5dfd59c88128081de4fd1203b2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 Oct 2013 18:00:31 +0200 Subject: [PATCH] [api] make sure we can call innocent rake tasks without mysql e.g. checking code --- src/api/config/initializers/hoptoad.rb | 10 ++++++++-- src/api/config/initializers/wrap_parameters.rb | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/api/config/initializers/hoptoad.rb b/src/api/config/initializers/hoptoad.rb index 0b7cf212c54..0144af48172 100644 --- a/src/api/config/initializers/hoptoad.rb +++ b/src/api/config/initializers/hoptoad.rb @@ -1,8 +1,14 @@ HoptoadNotifier.configure do |config| # Change this to some sensible data for your errbit instance config.api_key = CONFIG['errbit_api_key'] || 'YOUR_ERRBIT_API_KEY' - config.host = Configuration.errbit_url || 'YOUR_ERRBIT_HOST' - if CONFIG['errbit_api_key'].blank? || Configuration.errbit_url.blank? + begin + errbit_url = Configuration.errbit_url + rescue Mysql2::Error + # no mysql, no exceptions - useful for rake tasks + errbit_url = nil + end + config.host = errbit_url || 'YOUR_ERRBIT_HOST' + if CONFIG['errbit_api_key'].blank? || errbit_url.blank? config.development_environments = "production development test" else config.development_environments = "development test" diff --git a/src/api/config/initializers/wrap_parameters.rb b/src/api/config/initializers/wrap_parameters.rb index c3037192708..1ca42b7b21a 100644 --- a/src/api/config/initializers/wrap_parameters.rb +++ b/src/api/config/initializers/wrap_parameters.rb @@ -5,6 +5,7 @@ require 'active_support/core_ext/hash/conversions' require 'action_dispatch/http/request' require 'active_support/core_ext/hash/indifferent_access' +require 'api_exception' # Disable all default rails parameter parsing