skylight 0.1.6 → 0.1.7.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41a4af63fb1c46db8c3937d7d9db2dc65a541195
-  data.tar.gz: 82649e3004eb5e499201a92a9bc1066286b2e9f7
+  metadata.gz: db1b0ac1268ea2ee9d131e07bd233d1865f5ff7b
+  data.tar.gz: b42da292696538f036387909cdb44331ca32494a
 SHA512:
-  metadata.gz: cc2c68a79fab693e19130c5668cbf22abecf02bb7cd0096b46b1e4393aa2548ee414e412eb8361348b63f2a983eb3dd45b2b9aadf6efd56f5315e4aaa57fcf31
-  data.tar.gz: 54d50ade36a0bd2c1687e22f4add7b86d970eeaf65df1dfad9a6e235b234f40411513be4f7b71b6cffb980c46cfe751d2033cefbb9ce2a70826f28366442c449
+  metadata.gz: 2c59dceb8da40478a4e7a6ccb1b7d069268449ffbfe8aa61634f50e15296951f103ae3d5aa4cffce2eded0f4a7714c0ac9019f8ae75493487bfb5040fa6dab96
+  data.tar.gz: bd2f355e06b37128932b2ed61a03ee7340caaec31c2531cf293c65276832444962be7464f88daf91154a52e61684b12a36cfce040a0f01380b4cd3ebcf28074c

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## unreleased ##
 
+* Add the ability to configure logging from railtie
+
 ## 0.1.6 (June 11, 2013)
 
 * [BUG] Fix unix domain socket write function in standalone agent

data/lib/skylight/config.rb

@@ -1,13 +1,16 @@
 require 'yaml'
 require 'fileutils'
 require 'logger'
+require 'thread'
 
 module Skylight
   class Config
+    MUTEX = Mutex.new
 
     # Map environment variable keys with Skylight configuration keys
     ENV_TO_KEY = {
-      'SK_LOG'                 => :'log',
+      'SK_ROOT'                => :'root',
+      'SK_LOG_FILE'            => :'log_file',
       'SK_LOG_LEVEL'           => :'log_level',
       'SK_APPLICATION'         => :'application',
       'SK_AUTHENTICATION'      => :'authentication',
@@ -29,7 +32,7 @@ module Skylight
 
     # Default values for Skylight configuration keys
     DEFAULTS = {
-      :'log'                 => '-'.freeze,
+      :'log_file'            => '-'.freeze,
       :'log_level'           => 'INFO'.freeze,
       :'agent.keepalive'     => 60,
       :'agent.interval'      => 5,
@@ -138,6 +141,11 @@ module Skylight
       true
     end
 
+    def key?(key)
+      key = key.to_sym
+      @priority.key?(key) || @values.key?(key)
+    end
+
     def get(key, default = nil, &blk)
       key = key.to_sym
 
@@ -231,25 +239,35 @@ authentication: #{self[:authentication]}
       @gc ||= GC.new(self, get('gc.profiler', VM::GC.new))
     end
 
+    def root
+      self[:root] || Dir.pwd
+    end
+
     def logger
       @logger ||=
         begin
-          out = get(:'log')
-          out = STDOUT if out == '-'
+          MUTEX.synchronize do
+            unless l = @logger
+              out = get(:'log_file')
+              out = STDOUT if out == '-'
+
+              unless IO === out
+                out = File.expand_path(out, root)
+                FileUtils.mkdir_p(File.dirname(out))
+              end
+
+              l = Logger.new(out)
+              l.level =
+                case get(:'log_level')
+                when /^debug$/i then Logger::DEBUG
+                when /^info$/i  then Logger::INFO
+                when /^warn$/i  then Logger::WARN
+                when /^error$/i then Logger::ERROR
+                end
+            end
 
-          unless IO === out
-            FileUtils.mkdir_p(File.dirname(out))
+            l
           end
-
-          l = Logger.new(out)
-          l.level =
-            case get(:'log_level')
-            when /^debug$/i then Logger::DEBUG
-            when /^info$/i  then Logger::INFO
-            when /^warn$/i  then Logger::WARN
-            when /^error$/i then Logger::ERROR
-            end
-          l
         end
     end
 

data/lib/skylight/railtie.rb

@@ -34,7 +34,10 @@ module Skylight
       end
 
       config = Config.load(path, Rails.env.to_s, ENV)
-      config.logger = Rails.logger
+      config['root'] = Rails.root
+
+      configure_logging(config, app)
+
       config['agent.sockfile_path'] = tmp
       config['normalizers.render.view_paths'] = app.config.paths["app/views"].existent
       config.validate!
@@ -45,6 +48,28 @@ module Skylight
       nil
     end
 
+    def configure_logging(config, app)
+      if logger = app.config.skylight.logger
+        config.logger = logger
+      else
+        # Configure the log file destination
+        if log_file = app.config.skylight.log_file
+          config['log_file'] = log_file
+        elsif !config.key?('log_file')
+          config['log_file'] = File.join(Rails.root, 'log/skylight.log')
+        end
+
+        # Configure the log level
+        if level = app.config.skylight.log_level
+          config['log_level'] = level
+        elsif !config.key?('log_level')
+          if level = app.config.log_level
+            config['log_level'] = level
+          end
+        end
+      end
+    end
+
     def config_path(app)
       File.expand_path(config.skylight.config_path, app.root)
     end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.6'
+  VERSION = '0.1.7.alpha1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7.alpha1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3