multilog-collector 0.2.0 → 0.3.0

data/README.rdoc

@@ -2,6 +2,10 @@
 
 This is a log collector for multilog of daemontools services.
 
+== Install
+
+ sudo gem install multilog-collector
+
 == Usage
 
  Usage: multilog-collector [options]

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/multilog-collector.rb

@@ -5,10 +5,13 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'djb/daemontools/multilog/collector'
 
 directory = "/service"
+collector = Djb::Daemontools::Multilog::Collector.new
 
 opt = OptionParser.new
 opt.on('--help', 'show this message') { puts opt; exit }
-opt.on('-d DIR','--directory=DIR','service directory default: /service'){ |v| directory = v }
+opt.on('-d DIR','--directory=DIR','service directory default: /service'){ |v| collector.directory = v }
+opt.on('-l N','--lines=N','lines to collect default: 100'){ |v| collector.lines = v.to_i }
 opt.parse!(ARGV)
 
-puts Djb::Daemontools::Multilog::Collector.new(directory).collect
+puts collector.collect
+

data/lib/djb/daemontools/multilog/collector.rb

@@ -1,54 +1,15 @@
 #!/usr/bin/env ruby
-# vim:set fileencoding=utf-8:
-
-require 'djb/tai64n'
+# -*- coding: utf-8 -*-
+require 'djb/daemontools/multilog/logs'
 module Djb
   module Daemontools
     module Multilog
-      class Logs < Array
-        def load(file)
-          @file = file
-          open(file) do |f|
-            while line = f.gets
-              self << Log.new(line,service)
-            end
-          end
-          self
-        end
-
-        def service
-          $1 if /\/([^\/]+)\/log\/main\/current/ =~ @file
-        end
-
-        def to_s
-          join("\n",self)
-        end
-
-      end
-
-      class Log 
-        def initialize(line,service)
-          @line = line
-          @service = service
-        end
-
-        def tai64n
-          return $1 if /^(@[a-z0-9]+) / =~ @line
-        end
-
-        def time
-          Tai64n::to_local(tai64n)
-        end
-
-        def to_s
-          if /^(@[a-z0-9]+) (.*)/ =~ @line
-            "%s [%s] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"),@service,$2]
-          end
-        end
-      end
-
       class Collector
+        attr_accessor :service_dir,:lines
+        alias directory= service_dir=
+
         def initialize(dir = "/service")
+          @lines = 100
           @service_dir = dir
         end
 
@@ -56,20 +17,19 @@ module Djb
           all = Logs.new
           glob_pattern = @service_dir + "/*/log/main/current"
           Dir.glob(glob_pattern).each do |file| 
-            all += Logs.new.load(file)
+            all += Logs.new.load(file,@lines)
           end
-          all.sort do |a,b|
+          all.sort! do |a,b|
             a.time <=> b.time
           end
+          all[-@lines..-1]
         end
-        
-        
       end
       
     end
   end
 end
 =begin
-# collector = Djb::Daemontools::Multilog::Collector.new("/Users/tumf/service")
-# puts collector.collect
+#collector = Djb::Daemontools::Multilog::Collector.new("/Users/tumf/service")
+#puts collector.collect
 =end

data/lib/djb/daemontools/multilog/log.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'djb/tai64n'
+module Djb
+  module Daemontools
+    module Multilog
+      class Log 
+
+        def initialize(line,service)
+          @line = line
+          @service = service
+        end
+
+        def tai64n
+          return $1 if /^(@[a-z0-9]+) / =~ @line
+        end
+
+        def time
+          Tai64n::to_local(tai64n)
+        end
+
+        def to_s
+          if /^(@[a-z0-9]+) (.*)/ =~ @line
+            "%s [%s] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"),@service,$2]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/djb/daemontools/multilog/logs.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'djb/daemontools/multilog/log'
+module Djb
+  module Daemontools
+    module Multilog
+      class Logs < Array
+
+        def load(file,lines = nil)
+          @file = file
+          open(file) do |f|
+            n = 0
+            while line = f.gets
+              n += 1
+              self << Log.new(line,service)
+              break if lines and n >= lines
+            end
+          end
+          self
+        end
+
+        def service
+          $1 if /\/([^\/]+)\/log\/main\/current/ =~ @file
+        end
+
+        def to_s
+          join("\n",self)
+        end
+
+      end
+    end
+  end
+end

data/multilog-collector.gemspec

@@ -0,0 +1,68 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{multilog-collector}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Yoshihiro TAKAHARA"]
+  s.date = %q{2011-01-16}
+  s.description = %q{This is a log collector for multilog of daemontools services.}
+  s.email = %q{y.takahara@gmail.com}
+  s.executables = ["multilog-collector.rb", "multilog-collector"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/multilog-collector",
+    "bin/multilog-collector.rb",
+    "lib/djb/daemontools/multilog/collector.rb",
+    "lib/djb/daemontools/multilog/log.rb",
+    "lib/djb/daemontools/multilog/logs.rb",
+    "lib/djb/tai64n.rb",
+    "lib/multilog-collector.rb",
+    "multilog-collector.gemspec",
+    "test/helper.rb",
+    "test/test_multilog-collector.rb"
+  ]
+  s.homepage = %q{http://github.com/tumf/multilog-collector}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.1}
+  s.summary = %q{log collector for multilog.}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_multilog-collector.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multilog-collector
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +09:00
+date: 2011-01-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,8 +97,11 @@ files:
 - bin/multilog-collector
 - bin/multilog-collector.rb
 - lib/djb/daemontools/multilog/collector.rb
+- lib/djb/daemontools/multilog/log.rb
+- lib/djb/daemontools/multilog/logs.rb
 - lib/djb/tai64n.rb
 - lib/multilog-collector.rb
+- multilog-collector.gemspec
 - test/helper.rb
 - test/test_multilog-collector.rb
 has_rdoc: true