Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Martin Lensment 2015-08-13 19:10:40 +03:00
commit 867a43835e
5 changed files with 14 additions and 5 deletions

View file

@ -11,6 +11,7 @@ source 'https://rubygems.org'
gem 'rails', '4.2.3' # when update, all initializers eis_custom files needs check/update gem 'rails', '4.2.3' # when update, all initializers eis_custom files needs check/update
gem 'iso8601', '~> 0.8.6' # for dates and times gem 'iso8601', '~> 0.8.6' # for dates and times
gem 'hashie-forbidden_attributes', '~> 0.1.1' gem 'hashie-forbidden_attributes', '~> 0.1.1'
gem 'SyslogLogger', '~> 2.0.0'
# load env # load env
gem 'figaro', '~> 1.1.1' gem 'figaro', '~> 1.1.1'

View file

@ -36,6 +36,7 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
SyslogLogger (2.0)
abstract_type (0.0.7) abstract_type (0.0.7)
actionmailer (4.2.3) actionmailer (4.2.3)
actionpack (= 4.2.3) actionpack (= 4.2.3)
@ -539,6 +540,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
SyslogLogger (~> 2.0.0)
activerecord-import (~> 0.7.0) activerecord-import (~> 0.7.0)
autodoc autodoc
better_errors (~> 2.1.1) better_errors (~> 2.1.1)
@ -620,3 +622,6 @@ DEPENDENCIES
uuidtools (~> 2.1.4) uuidtools (~> 2.1.4)
validates_email_format_of (~> 1.6.3) validates_email_format_of (~> 1.6.3)
whenever (~> 0.9.4) whenever (~> 0.9.4)
BUNDLED WITH
1.10.6

View file

@ -46,7 +46,10 @@ Rails.application.configure do
config.log_level = :info config.log_level = :info
# Prepend all log lines with the following tags. # Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ] config.log_tags = [:subdomain, :uuid, :remote_ip]
# Use a different logger for distributed setups.
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new(ENV['app_name']))
# Use a different logger for distributed setups. # Use a different logger for distributed setups.
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)

View file

@ -46,10 +46,10 @@ Rails.application.configure do
config.log_level = :info config.log_level = :info
# Prepend all log lines with the following tags. # Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ] config.log_tags = [:subdomain, :uuid, :remote_ip]
# Use a different logger for distributed setups. # Use a different logger for distributed setups.
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new(ENV['app_name']))
# Use a different cache store in production. # Use a different cache store in production.
# config.cache_store = :mem_cache_store # config.cache_store = :mem_cache_store

View file

@ -46,10 +46,10 @@ Rails.application.configure do
config.log_level = :info config.log_level = :info
# Prepend all log lines with the following tags. # Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ] config.log_tags = [:subdomain, :uuid, :remote_ip]
# Use a different logger for distributed setups. # Use a different logger for distributed setups.
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new(ENV['app_name']))
# Use a different cache store in production. # Use a different cache store in production.
# config.cache_store = :mem_cache_store # config.cache_store = :mem_cache_store