Skip to content

Commit

Permalink
move dev log back to rails/log for dev mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Hirschfeld committed Mar 1, 2014
1 parent ce3d09c commit b3b8f0d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
17 changes: 16 additions & 1 deletion rails/config/application.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright 2011-4, Dell
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

require File.expand_path('../boot', __FILE__)

require 'rails/all'
Expand Down Expand Up @@ -72,7 +87,7 @@ class Application < Rails::Application
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names.
config.time_zone = 'UTC'
config.paths['log'] = "/var/log/crowbar/#{Rails.env}.log"
config.paths['log'] ||= "/var/log/crowbar/#{Rails.env}.log"

config.cache_store = [ :file_store, "/var/cache/crowbar/rails-cache/" ]
config.assets.cache_store = [ :file_store, "/var/cache/crowbar/rails-cache/assets/#{Rails.env}/" ]
Expand Down
5 changes: 3 additions & 2 deletions rails/config/environments/development.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2011, Dell
# Copyright 2011-4, Dell
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,5 +33,6 @@
config.eager_load = false
# Enable threaded mode
# config.threadsafe! unless $rails_rake_task
config.log_level = :debug
config.log_level = :info
config.paths['log'] = "./log/#{Rails.env}.log"
end

0 comments on commit b3b8f0d

Please sign in to comment.