blooper 1.5 → 1.6

data/README.rdoc

@@ -14,11 +14,11 @@ The idea is shamelessly stolen from {logmysqldaemon}[http://sourceforge.net/proj
 
 == Squid configuration
 
-    logformat squid_log time %ts.%03tu response_time %tr src_ip %>a squid_request_status %Ss http_status_code %03>Hs reply_size %<st request_method %rm request_url %ru username %un squid_hier_code %Sh dst_ip %<a mime_type %mt
+    logformat squid_log time %{%Y-%m-%d_%H:%M:%S%z}tl time_response %tr ip_source %>a squid_request_status %Ss http_status_code %03>Hs http_reply_size %<st http_request_method %rm http_request_url %ru user_name %un squid_hier_code %Sh ip_destination %<a http_content_type %mt
     access_log daemon:{adapter:postgres,database:squid,username:squid,password:squid,host:db} squid_log
     logfile_daemon /usr/local/bin/blooper
 
-1. The column names are dynamic, here time is a column name, %ts.%03tu is a value that will have been written into that column.
+1. The column names are dynamic, here time is a column name, %{%Y-%m-%d_%H:%M:%S%z} is a value that will be written into that column.
 
 2. The second string contains database access information, the credential depends on {adapter}[http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html], tested only with postgres.
 

data/bin/blooper

@@ -4,6 +4,6 @@
 # require 'ap'
 
 %w{logger singleton yaml sequel}.each {|lib| require lib}
-require_relative '../lib/blooper'
+require 'blooper'
 
 Blooper.application.start

data/lib/blooper.rb

@@ -1,10 +1,10 @@
-require_relative 'blooper/version.rb'
+require 'blooper/version.rb'
 BLOOPER_VERSION = Blooper::VERSION
 
-require_relative 'blooper/db.rb'
-require_relative 'blooper/input.rb'
-require_relative 'blooper/line.rb'
-require_relative 'blooper/rows.rb'
+require 'blooper/db.rb'
+require 'blooper/input.rb'
+require 'blooper/line.rb'
+require 'blooper/rows.rb'
 
 module Blooper
 
@@ -40,11 +40,8 @@ module Blooper
           @log.warn('A database connection has been lost, reconnecting...')
           DB.instance.connect
           retry
-        rescue Sequel::DatabaseError
-          @log.error('Probably data doesn\'t fit for database')
-          next
         rescue Sequel::Error => error
-          @log.error(error.message)
+          @log.error(error.message.gsub(/\n.*/s, ''))
           next
         end
       end
@@ -53,10 +50,9 @@ module Blooper
     private
 
     def formatter
-       -> severity, datetime, appname, msg do
-        "#{datetime.strftime(DATE_FORMAT)} " +
-         "#{appname}(#{severity[0]})| " +
-         "#{msg}\n"
+      -> severity, date_time, app_name, msg do
+        "#{date_time.strftime(DATE_FORMAT)} " +
+        "#{app_name}(#{severity[0]})| #{msg}\n"
       end
     end
 

data/lib/blooper/version.rb

@@ -1,3 +1,3 @@
 module Blooper
-  VERSION = "1.5" unless defined?(Blooper::VERSION)
+  VERSION = "1.6" unless defined?(Blooper::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blooper
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
   prerelease: 
 platform: ruby
 authors: