Skip to content
This repository has been archived by the owner on Jun 27, 2020. It is now read-only.

Commit

Permalink
Removes log4r dependency. (#1959)
Browse files Browse the repository at this point in the history
  • Loading branch information
dchandekstark authored and Jim Coble committed Jun 11, 2018
1 parent 34ed008 commit 44331f1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 70 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ before_install:
- gem install bundler
rvm:
- 2.3.1
before_script:
- "cp config/log4r.yml.sample config/log4r.yml"
cache: bundler
script: "bundle exec rake dul_hydra:ci:build"
# To exclude antivirus tests:
Expand Down
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruby '2.3.1'
gem 'rails', '4.2.7'

gem 'ddr-alerts', '1.1.0'
gem 'ddr-batch', '1.6.1'
gem 'ddr-batch', git: 'https://github.com/duke-libraries/ddr-batch.git', ref: '0a7f45fc79453a61e4ca26c6827b2d3da0fdc9c9'
gem 'ddr-models', :git => 'https://github.com/duke-libraries/ddr-models.git', :ref => '988d7dc9029c250acad84a78fcd749074aa94876'

gem 'hydra-head', '7.2.2'
Expand All @@ -17,8 +17,6 @@ gem 'virtus', '~> 1.0.5'
gem 'ezid-client', '~> 1.7'
gem 'bagit'

gem 'log4r'

# Background processing
gem 'resque', '1.25.2'
gem 'resque-pool', '~> 0.6.0'
Expand Down
21 changes: 12 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
GIT
remote: https://github.com/duke-libraries/ddr-batch.git
revision: 0a7f45fc79453a61e4ca26c6827b2d3da0fdc9c9
ref: 0a7f45fc79453a61e4ca26c6827b2d3da0fdc9c9
specs:
ddr-batch (1.7.0.pre)
ddr-models (~> 2.10)
devise (~> 3.4)
paperclip (~> 5.2)
rails (~> 4.1)

GIT
remote: https://github.com/duke-libraries/ddr-models.git
revision: 988d7dc9029c250acad84a78fcd749074aa94876
Expand Down Expand Up @@ -133,12 +144,6 @@ GEM
ddr-alerts (1.1.0)
rails (~> 4.2)
ddr-antivirus (2.1.1)
ddr-batch (1.6.1)
ddr-models (~> 2.10)
devise (~> 3.4)
log4r
paperclip (~> 5.2)
rails (~> 4.1)
debug_inspector (0.0.2)
deprecation (0.2.2)
activesupport
Expand Down Expand Up @@ -257,7 +262,6 @@ GEM
rdf-xsd (~> 1.1, >= 1.1.5)
sparql (~> 1.99)
sparql-client (~> 1.99)
log4r (1.1.10)
logger (1.2.8)
loofah (2.2.2)
crass (~> 1.0.2)
Expand Down Expand Up @@ -528,7 +532,7 @@ DEPENDENCIES
capybara (~> 2.0)
database_cleaner
ddr-alerts (= 1.1.0)
ddr-batch (= 1.6.1)
ddr-batch!
ddr-models!
deprecation
devise
Expand All @@ -539,7 +543,6 @@ DEPENDENCIES
hydra-head (= 7.2.2)
jettywrapper (~> 1.8)
jquery-rails
log4r
mime-types (~> 2.6)
mysql2 (~> 0.4.5)
nest (= 1.1.2)
Expand Down
11 changes: 1 addition & 10 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

require 'rails/all'

# log4r
require 'log4r'
require 'log4r/yamlconfigurator'
require 'log4r/outputter/datefileoutputter'
include Log4r

if defined?(Bundler)
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Expand Down Expand Up @@ -67,10 +61,7 @@ class Application < Rails::Application

config.active_record.raise_in_transactional_callbacks = true

# assign log4r's logger as Rails' logger
log4r_config = YAML.load_file(File.join(File.dirname(__FILE__),"log4r.yml"))
YamlConfigurator.decode_yaml(log4r_config['log4r_config'])
config.logger = Log4r::Logger[Rails.env]
config.logger = Logger.new(config.paths["log"].first, 5, 10**7)

# Load environment variable from file
# http://railsapps.github.io/rails-environment-variables.html
Expand Down
4 changes: 0 additions & 4 deletions config/initializers/log_formatting.rb

This file was deleted.

42 changes: 0 additions & 42 deletions config/log4r.yml.sample

This file was deleted.

0 comments on commit 44331f1

Please sign in to comment.