Add :format => :json option

lib/logglier/client.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Logglier
   module Client
 
@@ -57,8 +59,14 @@ def masher(hash, prefix=nil)
 
       def formatter
         proc do |severity, datetime, progname, msg|
-          message = "#{datetime} "
-          message << massage_message(msg, severity)
+          if @format == :json && msg.is_a?(Hash)
+            msg.merge!({ :severity => severity,
+                         :datetime => datetime,
+                         :progname => progname }).to_json
+          else
+            message = "#{datetime} "
+            message << massage_message(msg, severity)
+          end
         end
       end
 

lib/logglier/client/http.rb

@@ -1,4 +1,3 @@
-require 'net/https'
 require 'uri'
 
 require File.join(File.dirname(__FILE__), 'http', 'sync')
@@ -13,6 +12,7 @@ class HTTP
 
       def initialize(opts={})
         setup_input_uri(opts)
+        @format = opts[:format].to_sym
         @deliverer = if opts[:threaded]
           Logglier::Client::HTTP::DeliveryThread.new(@input_uri, opts)
         else

lib/logglier/client/http/sync.rb

@@ -1,3 +1,5 @@
+require 'net/https'
+
 module Logglier
   module Client
     class HTTP

spec/http_spec.rb

@@ -20,8 +20,12 @@
     @http.should_receive(:request_post).exactly(2).times.and_raise Errno::ECONNRESET
     @proxy.deliver('message')
   end
+
   it "fails for other errors" do
     @http.should_receive(:request_post).once.and_raise EOFError
     @proxy.deliver('message')
   end
+
+  describe "json format" do
+  end
 end