lookout-rack-utils 3.2.0.19 → 3.3.0.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODk5NmIxNjM0OGY5MjUxZGVhZmIyNmVjYjMyMTM2NjU0YzMzZTMxMw==
+    NjFjZjM4ZTdlZTM0OTM4ZGI4ZGE0NTRlNTFiODlmYTQ4NzgxNjk0Nw==
   data.tar.gz: !binary |-
-    ZDZlZWE5ZmNhZjA2NDJmZTIzMGZjMjJhNDIzMWI3YzYwZjNlMzE0NA==
+    MmU1MTc1YWYzOTljY2Y0ZTRhNjgyNTRhMTlhMmEyMmEyZDRlZmJmOQ==
 SHA512:
   metadata.gz: !binary |-
-    NGFiY2RkN2YzNmIwZGQ3ZTBjMjNiMzczNTMyNmYwMGYyM2MxOTkyYmY4NjBk
-    NDYzMWEzNGY2MWViYWM2ZGRhZWMwMjI4NWYzNDI1NzI2YWMyN2JjOGE3Mzll
-    YTI0ZmRhODc0ZjIwOWFhNThlOGM3YTU1ZDNmZGM4ZjFhODViZmM=
+    MjQ1ZmJiYTI5ZDljYTczZDgwMTA3YjQ1NGNiNGY3YjA5OGIzNDhmMWExOTVj
+    OWM3NDRiN2NjM2QxYmRlYTNhNGE3NzdjYmU5MjEzZTk5YmJkMzNlMjIwZTU3
+    MWMwZDNiNjU3MjQ2OGNjNDBiMjUwYjAzZWY5MGUyNTAwNTYzNTM=
   data.tar.gz: !binary |-
-    MDhjZDRmOWQ4M2RmNTg4Yjc1NDg1ZDQ2OTY3MGEwZTQ1NGJjMTgxYmRhN2Vj
-    Y2NmOTkxZTM0NGZkYmQ4M2VlYzQwOTE0YjRlZjZlZDhiYzc0Mzg2ZTFkNjk2
-    OTMwNzJiZTM5ZjJkYTQ4M2VkM2VkZThhYWRlNDg0MzA2NzJhMDM=
+    Y2UwOTVkMTM4YjMwODdhYzVmY2I2M2FlNDlmMTA4Yjc4NjBkYzgxOWI2M2Iw
+    MGFjOGYwOWJhZTA1MTBmNGRjYTc4MzRiY2RmZDU3YjJhNmNlMjg1NTc1MTY5
+    NWQxM2YwMjZjZDc2NDEzYTFjZTBkZTA1NmUyMGI2YWRkZjc0ODM=

data/lib/lookout/rack/utils/log.rb

@@ -78,9 +78,7 @@ module Lookout::Rack::Utils
         @logger.level = Log4r::OFF
       end
 
-      @outputter = FileOutputter.new("#{logger_name.to_s}fileoutput",
-                                     {:filename => configatron.logging.file,
-                                      :trunc => false})
+      @outputter = build_outputter(logger_name)
       @logger.trace = true
       @outputter.formatter = LookoutFormatter
       @logger.outputters = @outputter
@@ -104,5 +102,17 @@ module Lookout::Rack::Utils
         @logger.send(allow_logging, *args)
       end
     end
+
+    # Build and return the appropriate Outputter
+    def build_outputter(logger_name)
+      if configatron.logging.file =~ /^stdout$/i
+        StdoutOutputter.new("#{logger_name}stdout")
+      else
+        FileOutputter.new("#{logger_name}fileoutput",
+                          {:filename => configatron.logging.file,
+                           :trunc => false})
+      end
+    end
+    private :build_outputter
   end
 end

data/lib/lookout/rack/utils/version.rb

@@ -1,7 +1,7 @@
 module Lookout
   module Rack
     module Utils
-      VERSION = "3.2.0"
+      VERSION = "3.3.0"
     end
   end
 end

data/spec/log_spec.rb

@@ -6,10 +6,11 @@ require 'configatron'
 describe Lookout::Rack::Utils::Log do
   subject(:log) { described_class.instance }
   subject(:log_message) { 'foo' }
+  let(:filename) { "log" }
 
-  before :all do
+  before :each do
     configatron.logging.enabled = true
-    configatron.logging.file = "log"
+    allow(configatron.logging).to receive(:file).and_return(filename)
   end
 
   describe '.debug' do
@@ -65,6 +66,26 @@ describe Lookout::Rack::Utils::Log do
       end
     end
   end
+
+  # Private method but tested since we can't otherwise test configuration of the singleton
+  describe "#build_outputter" do
+    let(:logger_name) { "logger" }
+    subject(:build_outputter) { log.send(:build_outputter, logger_name)}
+
+    context "when logging to a file" do
+      let(:filename) { "foo.log" }
+      it "should use a FileOutputter" do
+        expect(subject).to be_a(Log4r::FileOutputter)
+      end
+    end
+
+    context "when logging to STDOUT" do
+      let(:filename) { "STDOUT" }
+      it "should use a StdoutOutputter" do
+        expect(subject).to be_a(Log4r::StdoutOutputter)
+      end
+    end
+  end
 end
 
 describe Lookout::Rack::Utils::Log::LookoutFormatter do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-rack-utils
 version: !ruby/object:Gem::Version
-  version: 3.2.0.19
+  version: 3.3.0.22
 platform: ruby
 authors:
 - Ian Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler