tapsilog 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.3.0
+Fully compatible with old analogger protocol
+Added support for overriding backend at service level
+**Previous tapsilog releases are not compatible anymore. Upgrade to 0.3.0 clients is required
+
 v0.2.0
 Improved command line interface
 Includes tapsilog_tail utility

data/README.md

@@ -64,7 +64,11 @@
         target: default
 
       - service: access
-        target: access
+        target: /some/special/logfile
+
+        # You can override the global backend for this service
+        backend:
+          adapter: file
 
       - service: bizsupport
         target: bizsupport

data/Rakefile

@@ -1,6 +1,6 @@
 require 'echoe'
 
-Echoe.new('tapsilog', '0.2.0') do |p|
+Echoe.new('tapsilog', '0.3.0') do |p|
   p.author         = "Palmade"
   p.project        = "tapsilog"
   p.summary        = "Hydrid app-level logger from Palmade. Analogger fork."

data/bin/tapsilog

@@ -82,7 +82,7 @@ module Palmade::Tapsilog
           exit
         end
         opts.on('-v', '--version', "Show version") do
-          puts 'tapsilog 0.2.0'
+          puts 'tapsilog 0.3.0'
           exit
         end
 

data/bin/tapsilog_tail

@@ -35,7 +35,7 @@ optparse = OptionParser.new do |opts|
     exit
   end
   opts.on('-v', '--version', "Show version") do
-    puts 'tapsilog_tail 0.2.0'
+    puts 'tapsilog_tail 0.3.0'
     exit
   end
 end
@@ -50,7 +50,6 @@ else
   tapsilog_config['backend'] ||= {}
   tapsilog_backend = tapsilog_config['backend']
   tapsilog_config['logs'] ||= []
-  adapter = tapsilog_config['backend']['adapter'] || 'file'
 
   if tapsilog_config['default_log']
     tapsilog_config['logs'].push({'service' => 'default', 'target' => tapsilog_config['default_log']})
@@ -62,8 +61,14 @@ else
     target = srv['target'] || srv['logfile']
 
     services[service_name] = target
+
+    if srv['backend'] and service_name == service
+      tapsilog_config['backend'] = srv['backend']
+    end
   end
 
+  adapter = tapsilog_config['backend']['adapter'] || 'file'
+
   if adapter == 'file'
     command = "tail"
     command += " -f " if config[:follow]
@@ -89,6 +94,8 @@ else
       exit
     end
 
+    puts "==> Tailing logs from file: #{tail_target} <==\n\n"
+
     command += " #{tail_target} "
     system command
   elsif adapter == 'mongo'
@@ -128,6 +135,8 @@ else
       end
     end
 
+    puts "==> Tailing logs from mongoDB: #{tail_target} <==\n\n"
+
     last_entries = db[tail_target].find({}, :sort => ['_id', :desc], :limit => config[:lines].to_i).to_a.reverse
     print_entries.call(last_entries)
 

data/lib/palmade/tapsilog/conn.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 module Palmade::Tapsilog
   class Conn
     attr_reader :socket
@@ -34,9 +32,8 @@ module Palmade::Tapsilog
 
       ts = Time.now if ts.nil?
       tag_string = Utils.hash_to_query_string(tags)
-      message = CGI.escape(message)
 
-      fullmsg = ":#{service}:#{instance_key}:#{severity}:#{message}:#{tag_string}"
+      fullmsg = ":#{service}:#{instance_key}:#{severity}:#{tag_string}:#{message}"
 
       # Truncate below the 8192 limit on Tapsilog service
       fullmsg = fullmsg[0,8190] if fullmsg.size > 8190

data/lib/palmade/tapsilog/protocol.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 module Palmade::Tapsilog
   class Protocol < EventMachine::Connection
     Ci = 'i'.freeze
@@ -16,6 +14,7 @@ module Palmade::Tapsilog
       @length = nil
       @logchunk = ''
       @authenticated = nil
+      @use_analogger_protocol = false
     end
 
     def receive_data(data)
@@ -55,7 +54,7 @@ module Palmade::Tapsilog
     end
 
     def get_message
-      msg = @logchunk.slice!(0..@length).split(Rcolon, 6)
+      msg = @logchunk.slice!(0..@length).split(Rcolon, 5)
 
       unless @authenticated
         @authenticated = authenticate_message(msg)
@@ -66,8 +65,12 @@ module Palmade::Tapsilog
         msg.shift
 
         msg[0] = msg[0].to_s.gsub(/[^a-zA-Z0-9\-\_\.]\s/, '').strip
-        msg[3] = CGI.unescape(msg[3].to_s)
-        msg[4] = Utils::query_string_to_hash(msg[4].to_s)
+
+        unless @use_analogger_protocol
+          tag_string, message = msg[3].split(':', 2)
+          msg[3] = message
+          msg[4] = Utils::query_string_to_hash(tag_string.to_s)
+        end
 
         LoggerClass.add_log(msg)
         @length = nil
@@ -76,12 +79,15 @@ module Palmade::Tapsilog
 
     def authenticate_message(msg)
       if msg[4] == LoggerClass.key
+        @use_analogger_protocol = true
+        return true
+      elsif msg[4].split(':', 2)[1] == LoggerClass.key
         return true
       else
         peer = get_peername
         peer = (peer ? ::Socket.unpack_sockaddr_in(peer)[1] : 'UNK') rescue 'UNK'
 
-        LoggerClass.add_log([:default, $$.to_s, :error, "Invalid key from #{peer} -- #{msg.last}"])
+        LoggerClass.add_log([:default, $$.to_s, :error, "Invalid key from #{peer} -- #{msg[4]}"])
         close_connection
         return false
       end

data/lib/palmade/tapsilog/server.rb

@@ -26,6 +26,7 @@ module Palmade::Tapsilog
 
     def self.boot
       load_adapter
+      load_service_adapters
 
       trap("INT") { exit }
       trap("TERM") { exit }
@@ -55,6 +56,24 @@ module Palmade::Tapsilog
       @adapter = adapter.new(adapter_config)
     end
 
+    def self.load_service_adapters
+      logs = @config[:logs] || []
+      @service_adapters = {}
+       
+      logs.each do |service|
+        if service['backend']
+          adapter_name = service['backend']['adapter']
+          class_name = "#{adapter_name.capitalize}Adapter"
+          adapter = Palmade::Tapsilog::Adapters.const_get(class_name) 
+
+          adapter_config = Utils.symbolize_keys(service['backend'])
+          adapter_config[:services] = [service]
+
+          @service_adapters[service['service']] = adapter.new(adapter_config)
+        end
+      end
+    end
+
     def self.prepare_server
       if @config[:socket]
         @usocks = @config[:socket]
@@ -145,13 +164,21 @@ module Palmade::Tapsilog
     def self.write_queue
       @queue.each do |log_message|
         next unless SeverityLevels.include?(log_message[3].to_sym)
-        @adapter.write(log_message)
+        service = log_message[1]
+        if @service_adapters[service]
+          @service_adapters[service].write(log_message)
+        else
+          @adapter.write(log_message)
+        end
       end
       @queue.clear
     end
 
     def self.flush_queue
       @adapter.flush
+      @service_adapters.each do |service, adapter|
+        adapter.flush
+      end
     end
 
   end

data/tapsilog.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tapsilog}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Palmade"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-09-13}
   s.description = %q{Hydrid app-level logger from Palmade. Analogger fork.}
   s.email = %q{}
   s.executables = ["tapsilog", "tapsilog_tail"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Palmade
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 +08:00
+date: 2010-09-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency