diff --git a/.travis.yml b/.travis.yml index 38104caec..34b265377 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.1.1 + - 2.1.3 bundler_args: --without development env: - SPEC_GROUP=controllers diff --git a/Gemfile b/Gemfile index 312a230ad..294899a11 100644 --- a/Gemfile +++ b/Gemfile @@ -91,8 +91,6 @@ gem 'codemirror-rails', '~> 4.5' group :production do gem "airbrake", '~> 3.1' #gem 'bluepill', '~> 0.0.60', require: false - # gem 'le' - gem 'logglier' gem 'puma' end diff --git a/Gemfile.lock b/Gemfile.lock index 005b7adc1..f17180b7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,6 @@ GEM rack rest-client ya2yaml - logglier (0.2.11) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -549,7 +548,6 @@ DEPENDENCIES jquery-rails (~> 2.3) js-routes localeapp - logglier mailcatcher meta-tags (~> 2.0) meta_request diff --git a/config/application.yml.sample b/config/application.yml.sample index 58a80ea86..8e74406a3 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -16,7 +16,6 @@ common: &common key_pair_secret_key: 'key_pair_secret_key' node_instruction_secret_key: 'node_instruction_secret_key' airbrake_api_key: 'airbrake_api_key' - logentries_key: 'logentries_key' secret_token: 'secret_token' secret_key_base: 'secret_key_base' devise: diff --git a/config/initializers/logentries.rb b/config/initializers/logentries.rb deleted file mode 100644 index 2c9ba46c9..000000000 --- a/config/initializers/logentries.rb +++ /dev/null @@ -1,8 +0,0 @@ -# require 'le' - -# key = APP_CONFIG['keys']['logentries_key'] -# if Rails.env.development? -# Rails.logger = Le.new key, debug: true -# else -# Rails.logger = Le.new key -# end \ No newline at end of file diff --git a/config/initializers/logglier.rb b/config/initializers/logglier.rb deleted file mode 100644 index f0a9eaa34..000000000 --- a/config/initializers/logglier.rb +++ /dev/null @@ -1,5 +0,0 @@ -# require 'logglier' - -# if Rails.env.production? -# Rails.logger = Logglier.new("https://logs-01.loggly.com/inputs/#{APP_CONFIG['keys']['logglier_key']}/tag/ruby/", threaded: true) -# end \ No newline at end of file