logglier 0.2.8 → 0.2.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yzc0NmNmOWNjZTQwMjA0YzQ2ZmFmMjAwMWJlNThhN2RmOWE2NjA0NQ==
+  data.tar.gz: !binary |-
+    YTVkMDI0ZTRiYjc1YTYzMjYwY2ZhMzUyZTZmZDBlNDU0ODc3MTc4OQ==
+SHA512:
+  metadata.gz: !binary |-
+    NjAzMTNhMTQ0Y2YwNjZlZjU0NzNjYjk0MjM1ODBhZjMwZjE5ZjdmYTRjYmM0
+    YjFmZmNmZjE5MDRiNTNlZWZiNGU3MGJlZDYyNjA0NTgxMTZiNGUwMTg3YTA4
+    NWQzYjY4YzNkYTQ5YzY2ODE1ODhhYmZjY2IxMzM0YjY5ODVhNWI=
+  data.tar.gz: !binary |-
+    NWNhOWM3MjU1ZjE0MjNiNWIxOTEwYThiODQ5ZDNlODgyZTNkMjNjZjM4NDY4
+    ZWUwMGIyYTU3OWY3ZWU2MTE2NzRlMTNjNWRiOTUwY2E1YjgwYjQ4ZDUwM2Zk
+    MGFkOWY4MzZhZWUxMmVlNzY2M2Y4Y2ViOTg1Y2M3NmUzMTlhNTE=

data/Gemfile

@@ -1,16 +1,7 @@
-source 'http://rubygems.org'
+source :rubygems
 
 gemspec
 
 platforms :jruby do
   gem 'jruby-openssl'
-  gem 'json'
-end
-
-platforms :mri_18 do
-  gem 'json'
-end
-
-platforms :rbx do
-  gem 'json'
 end

data/README.md

@@ -1,6 +1,6 @@
 Overview
 --------
-[![Build Status](http://travis-ci.org/freeformz/logglier.png)](http://travis-ci.org/freeformz/logglier)
+[![Build Status](https://travis-ci.org/freeformz/logglier.png)](https://travis-ci.org/freeformz/logglier)
 
 Send logged messages to Loggly using either the HTTP API or Syslog/UDP.
 
@@ -67,6 +67,9 @@ Example:
     Logglier.new('https://logs.loggly.com/inputs/<id>',
                  :format => :json)
 
+Logglier uses [MultiJson](https://github.com/intridea/multi_json) to delegate the choice of JSON libraries to you, but I recommend using
+[Yajl](https://github.com/brianmario/yajl-ruby), just require the json gem of your choice before logglier.
+
 ### Syslog TCP/UDP Inputs
 
     Logglier.new('[udp|tcp]://<hostname>:<port>/<facility>')
@@ -110,6 +113,7 @@ Pull requests welcome
 TODO
 -----
 
+* Support ActiveSupport Notifications for newer rails
 * Alternative https implementations (Typheous, Excon, etc). May be
   faster?
 * EM Integration?

data/lib/logglier/client/http/sync.rb

@@ -32,6 +32,10 @@ module Logglier
           @open_timeout = opts[:open_timeout] || 5
           @failsafe = opts[:failsafe] || $stderr
           @format = opts[:format] ? opts[:format].to_sym : nil
+          @proxy_addr = opts[:proxy_addr]
+          @proxy_port = opts[:proxy_port]
+          @proxy_user = opts[:proxy_user]
+          @proxy_password = opts[:proxy_password]
           @headers = {}
           if @format == :json
             @headers['Content-Type'] = 'application/json'
@@ -68,7 +72,8 @@ module Logglier
         private
 
         def connect!
-          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
+          @http_class = Net::HTTP::Proxy(@proxy_addr, @proxy_port, @proxy_user, @proxy_user)
+          @http = @http_class.new(@input_uri.host, @input_uri.port)
 
           if @input_uri.scheme == 'https'
             @http.use_ssl = true
@@ -86,7 +91,7 @@ module Logglier
         end
 
         def failsafe_retrying(exception, message, retries)
-          @failsafe.puts "WARNING: [#{retries}/#{RETRIES}] " + failsafe_message(exception, message)
+          @failsafe.puts "RETRY: [#{retries} of #{RETRIES}] " + failsafe_message(exception, message)
         end
 
         def failsafe_errored(exception, message)

data/lib/logglier/client.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 
 module Logglier
   module Client
@@ -60,9 +60,9 @@ module Logglier
       def formatter
         proc do |severity, datetime, progname, msg|
           if @format == :json && msg.is_a?(Hash)
-            msg.merge!({ :severity => severity,
-                         :datetime => datetime,
-                         :progname => progname }).to_json
+            MultiJson.dump(msg.merge({ :severity => severity,
+                                       :datetime => datetime,
+                                       :progname => progname }))
           else
             message = "#{datetime} "
             message << massage_message(msg, severity)

data/lib/logglier/version.rb

@@ -1,3 +1,3 @@
 module Logglier
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

data/logglier.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.email             = 'edwardam@interlix.com'
   s.homepage          = 'http://github.com/freeformz/logglier'
 
-  s.files             = %w{ README.md Gemfile LICENSE logglier.gemspec Rakefile } + Dir["#{dir}/lib/**/*.rb"]
+  s.files             = %w{ README.md Gemfile LICENSE logglier.gemspec Rakefile } + Dir["lib/**/*.rb"]
   s.require_paths     = ['lib']
-  s.test_files        = Dir["#{dir}/spec/**/*.rb"]
+  s.test_files        = Dir["spec/**/*.rb"]
 
   s.rubyforge_project = 'logglier'
 
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.11.0'
+  s.add_development_dependency 'multi_json'
 end
 
 

data/spec/client_spec.rb

@@ -28,9 +28,8 @@ describe Logglier::Client do
       end
 
       context "that is a valid udp uri" do
-
         it "should return an instance of the proper client" do
-          log = Logglier::Client.new('udp://logs.loggly.com:42538')
+          log = Logglier::Client.new('udp://localhost:42538')
           log.should be_an_instance_of Logglier::Client::Syslog
         end
       end

data/spec/http_spec.rb

@@ -46,7 +46,7 @@ describe 'HTTP' do
             @failsafe.rewind
             lines = @failsafe.readlines
             lines.size.should == 4
-            lines[0..2].each {|l| l.should =~ /^WARNING/ }
+            lines[0..2].each {|l| l.should =~ /^RETRY/ }
             lines.last.should =~ /^ERROR/
           end
         end
@@ -67,7 +67,7 @@ describe 'HTTP' do
             @failsafe.rewind
             lines = @failsafe.readlines
             lines.size.should == 3
-            lines[0..2].each {|l| l.should =~ /^WARNING/ }
+            lines[0..2].each {|l| l.should =~ /^RETRY/ }
           end
         end
       end

data/spec/threaded_spec.rb

@@ -6,7 +6,7 @@ describe Logglier::Client::HTTP::DeliveryThread do
     Logglier::Client::HTTP::NetHTTPProxy.stub(:new) { @mock_http }
   end
 
-  subject { described_class.new(URI.parse('http://localhost')) }
+  subject { Logglier::Client::HTTP::DeliveryThread.new(URI.parse('http://localhost')) }
 
   it "should deliver the message" do
     @mock_http.should_receive(:deliver).with("test")
@@ -26,7 +26,7 @@ describe Logglier::Client::HTTP::DeliveryThreadManager do
     Logglier::Client::HTTP::NetHTTPProxy.stub(:new) { @mock_http }
   end
 
-  subject { described_class.new(URI.parse('http://localhost')) }
+  subject { Logglier::Client::HTTP::DeliveryThreadManager.new(URI.parse('http://localhost')) }
 
   it "should instantiate a delivery_thread" do
     Logglier::Client::HTTP::DeliveryThread.should_receive(:new).once
@@ -50,6 +50,8 @@ describe Logglier::Client::HTTP::DeliveryThreadManager do
 
     @first_thread.kill
 
+    @first_thread.join
+
     subject.deliver('force respawn')
 
     @second_thread = subject.instance_variable_get(:@thread)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logglier
 version: !ruby/object:Gem::Version
-  version: 0.2.8
-  prerelease: 
+  version: 0.2.9
 platform: ruby
 authors:
 - Edward Muller (aka freeformz)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,11 +34,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Logger => Loggly
 email: edwardam@interlix.com
 executables: []
@@ -54,48 +63,46 @@ files:
 - LICENSE
 - logglier.gemspec
 - Rakefile
-- ./lib/logglier/client/http/sync.rb
-- ./lib/logglier/client/http/threaded.rb
-- ./lib/logglier/client/http.rb
-- ./lib/logglier/client/syslog.rb
-- ./lib/logglier/client.rb
-- ./lib/logglier/version.rb
-- ./lib/logglier.rb
-- ./spec/client/syslog_spec.rb
-- ./spec/client_spec.rb
-- ./spec/http_spec.rb
-- ./spec/logglier_spec.rb
-- ./spec/spec_helper.rb
-- ./spec/threaded_spec.rb
+- lib/logglier/client/http/sync.rb
+- lib/logglier/client/http/threaded.rb
+- lib/logglier/client/http.rb
+- lib/logglier/client/syslog.rb
+- lib/logglier/client.rb
+- lib/logglier/version.rb
+- lib/logglier.rb
+- spec/client/syslog_spec.rb
+- spec/client_spec.rb
+- spec/http_spec.rb
+- spec/logglier_spec.rb
+- spec/spec_helper.rb
+- spec/threaded_spec.rb
 homepage: http://github.com/freeformz/logglier
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: logglier
-rubygems_version: 1.8.23
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Loggly "plugin" for Logger
 test_files:
-- ./spec/client/syslog_spec.rb
-- ./spec/client_spec.rb
-- ./spec/http_spec.rb
-- ./spec/logglier_spec.rb
-- ./spec/spec_helper.rb
-- ./spec/threaded_spec.rb
-has_rdoc: 
+- spec/client/syslog_spec.rb
+- spec/client_spec.rb
+- spec/http_spec.rb
+- spec/logglier_spec.rb
+- spec/spec_helper.rb
+- spec/threaded_spec.rb