runit-man 2.4.0a1 → 2.4.0a2

data/cookbooks/provisioning/recipes/default.rb

@@ -17,3 +17,6 @@ runit_service "runit-man"
 # logger installation
 runit_service "runit-man-logger"
 
+# need vim for inplace actions
+package "vim-nox"
+

data/lib/runit-man/app.rb

@@ -153,30 +153,45 @@ class RunitMan::App < Sinatra::Base
     Yajl::Encoder.encode(service_infos)
   end
 
+  def log_of_service_n(filepath, count, no)
+    text = ''
+    if File.readable?(filepath)
+      File::Tail::Logfile.open(filepath, :backward => count, :return_if_eof => true) do |log|
+        log.tail do |line|
+          text += line
+        end
+      end
+    end
+
+    {
+      :location => filepath,
+      :text     => text,
+      :id       => no
+    }
+  end
+
   def log_of_service(name, count, no)
     count = count.to_i
-    count = MIN_TAIL if count < MIN_TAIL
-    count = MAX_TAIL if count > MAX_TAIL
+    count = MIN_TAIL  if count < MIN_TAIL
+    count = MAX_TAIL  if count > MAX_TAIL
     srv   = ServiceInfo.klass[name]
     return nil  if srv.nil? || !srv.logged?
 
-    text = ''
-    File::Tail::Logfile.open(srv.log_file_location, :backward => count, :return_if_eof => true) do |log|
-      log.tail do |line|
-        text += line
+    logs = []
+    if no.nil?
+      srv.log_file_locations.each_with_index do |filepath, no|
+        logs << log_of_service_n(filepath, count, no)
       end
+    else
+      filepath = srv.log_file_locations[no]
+      return nil  if filepath.nil?
+      logs << log_of_service_n(filepath, count, no)
     end
 
     {
       :name  => name,
       :count => count,
-      :logs  => [
-        {
-          :location => srv.log_file_location,
-          :text     => text,
-          :id       => 0
-        }
-      ]
+      :logs  =>  logs
     }
   end
 
@@ -224,7 +239,7 @@ class RunitMan::App < Sinatra::Base
 
     haml :log_downloads, :locals => {
       :name  => name,
-      :files => srv.log_files
+      :files => srv.all_log_file_locations
     }
   end
 
@@ -232,10 +247,10 @@ class RunitMan::App < Sinatra::Base
     srv = ServiceInfo.klass[name]
     return not_found  if srv.nil? || !srv.logged?
 
-    f = srv.log_files.detect { |f| f[:name] == file_name }
+    f = srv.all_log_file_locations.detect { |f| f[:name] == file_name }
     return not_found  unless f
 
-    send_file(srv.log_file_path(file_name), :type => 'text/plain', :disposition => 'attachment', :filename => f[:label], :last_modified => f[:modified].httpdate)
+    send_file(f[:path], :type => 'text/plain', :disposition => 'attachment', :filename => f[:label], :last_modified => f[:modified].httpdate)
   end
 
   get '/view' do
@@ -244,7 +259,7 @@ class RunitMan::App < Sinatra::Base
 
     @title = t('runit.view_file.title', :file => data[:name], :host => host_name)
     content_type CONTENT_TYPES[:html], :charset => 'utf-8'
-    haml :view_file, :locals => data 
+    haml :view_file, :locals => data
   end
 
   get '/view.txt' do

data/lib/runit-man/service_info.rb

@@ -1,3 +1,4 @@
+# Namespace: Information about service
 module ServiceInfo
   class << self
     attr_accessor :klass

data/lib/runit-man/service_info/base.rb

@@ -1,7 +1,7 @@
-require 'runit-man/log_location_cache/base'
 require 'runit-man/service_status'
 require 'runit-man/utils'
 
+# Represents information about service on any host.
 class ServiceInfo::Base
 
   attr_reader :name
@@ -99,18 +99,13 @@ class ServiceInfo::Base
     @log_status.pid
   end
 
-  def log_file_location
-    rel_path = ServiceInfo.klass.log_location_cache[log_pid]
-    return nil  if rel_path.nil?
-
-    File.expand_path(rel_path, log_run_folder)
-  end
-
-  def log_file_path(file_name)
-    nil
+  # Current log file locations
+  def log_file_locations
+    []
   end
 
-  def log_files
+  # All log file locations
+  def all_log_file_locations
     []
   end
 
@@ -200,10 +195,41 @@ protected
     @files[file_name] = ServiceInfo::Base.real_data_from_file(file_name)
   end
 
-  def sorted_log_files(log_files)
-    return log_files  if log_files.length < 2
+  def sorted_file_locations(file_locations)
+    return file_locations  if file_locations.length < 2
+
+    file_locations.sort { |a, b| a[:created] <=> b[:created] }
+  end
+
+  def logger_name
+    not_implemented
+  end
+
+  def log_command
+    return nil  if log_pid.nil?
+
+    ps_output = `ps -o args -p #{log_pid} 2>&1`.split("\n")
+    return nil  if ps_output.length < 2
+
+    cmd = ps_output[1].chomp
+    cmd != '' ? cmd : nil
+  end
+
+  def log_command_args
+    cmd = log_command
+    return nil  if cmd.nil?
+
+    args = cmd.split(/\s+/).select { |arg| arg !~ /^\-/ }
+    return nil  if args.shift !~ /#{Regexp.escape(logger_name)}/
+
+    args
+  end
+
+  def log_folder_base_name
+    args = log_command_args
+    return nil  if args.nil?
 
-    log_files.sort { |a, b| a[:created] <=> b[:created] }
+    args.first
   end
 
   class << self

data/lib/runit-man/service_info/logger.rb

@@ -1,23 +1,55 @@
-require 'runit-man/log_location_cache/logger'
-
+# Represents information about service on logger-enabled host.
 class ServiceInfo::Logger < ServiceInfo::Base
 
-  def log_file_path(file_name)
-    dir_name = File.dirname(File.dirname(log_file_location))
-    loc = File.expand_path(File.join(file_name, "#{name}.log"), dir_name)
+  def logger_string
+    RunitMan::App.runit_logger
+  end
+
+  def logger_name
+    (logger_string =~ /^([^\:]+)\:/) ? $1 : logger_string
+  end
+
+  def log_base_folder
+    (logger_string =~ /^[^\:]+\:([^\:]+)/) ? $1 : nil
+  end
+
+  def log_folder
+    folder = log_folder_base_name
+    (log_base_folder.nil? || folder.nil?) ? folder : File.expand_path(File.join(log_base_folder, folder))
+  end
+
+  def log_folder_base_name
+    result = super
 
-    loc = "#{loc}.gz"  unless File.exists?(loc)
-    loc = nil  unless File.exists?(loc)
+    # we should remove : from the end of the line for logger installations.
+    result = $1  if result =~ /^(.+)\:$/
 
-    loc
+    result
   end
 
-  def log_files
-    lfloc = log_file_location
-    return []  if lfloc.nil?
+  # Current log file locations
+  def log_file_locations
+    folder = log_folder
+    return []  if folder.nil? || ! File.directory?(log_folder)
 
-    dir_name = File.expand_path(File.dirname(File.dirname(lfloc)))
-    return []  unless File.directory?(dir_name)
+    curdir = File.join(log_folder, Time.now.strftime('%Y-%m-%d'))
+    return []  unless File.directory?(curdir)
+    r = []
+    Dir.foreach(curdir) do |filename|
+      next  if ServiceInfo::Base.itself_or_parent?(filename)
+      filepath = File.expand_path(filename, curdir)
+      next  unless File.file?(filepath) && File.readable?(filepath)
+
+      r << filepath
+    end
+
+    r
+  end
+
+  # All log file locations
+  def all_log_file_locations
+    dir_name = log_folder
+    return []  if log_folder.nil? || ! File.directory?(dir_name)
 
     r = []
     Dir.foreach(dir_name) do |subdirname|
@@ -28,15 +60,17 @@ class ServiceInfo::Logger < ServiceInfo::Base
       Dir.foreach(subdirpath) do |filename|
         next  if ServiceInfo::Base.itself_or_parent?(filename)
         filepath = File.expand_path(filename, subdirpath)
-        label = "#{Utils.host_name}-#{filename}"
         next  unless File.file?(filepath) && File.readable?(filepath)
 
-        stats = File.stat(file_name)
+        label = "#{Utils.host_name}-#{subdirname}-#{filename}"
+
+        stats = File.stat(filepath)
         stat_times = [stats.ctime.utc, stats.atime.utc, stats.mtime.utc]
         min_time, max_time = stat_times.min, stat_times.max
 
         r << {
-          :name     => name,
+          :name     => filename,
+          :path     => filepath,
           :label    => label,
           :size     => stats.size,
           :created  => min_time,
@@ -44,13 +78,8 @@ class ServiceInfo::Logger < ServiceInfo::Base
         }
       end
     end
-    sorted_log_files(r)
-  end
 
-  class << self
-    def log_location_cache
-      @log_location_cache ||= LogLocationCache::Logger.new(RunitMan::App.runit_logger)
-    end
+    sorted_file_locations(r)
   end
 end
 

data/lib/runit-man/service_info/svlogd.rb

@@ -1,22 +1,36 @@
-require 'runit-man/log_location_cache/svlogd'
-
+# Represents information about service on svlogd-enabled host.
 class ServiceInfo::Svlogd < ServiceInfo::Base
   SPECIAL_LOG_FILES = %w(lock config state newstate).freeze
 
-  def log_file_path(file_name)
-    dir_name = File.dirname(log_file_location)
-    File.expand_path(file_name, dir_name)
+  def logger_name
+    'svlogd'
+  end
+
+  def log_folder
+    log_folder_base_name
+  end
+
+  # Current log file locations
+  def log_file_locations
+    folder = log_folder
+    return []  if folder.nil?
+
+    [ File.join(folder, 'current') ]
   end
 
-  def log_files
+  # All log file locations
+  def all_log_file_locations
+    dir_name = log_folder
+    return []  if dir_name.nil? || ! File.directory?(dir_name)
     r = []
-    dir_name = File.dirname(log_file_location)
     Dir.foreach(dir_name) do |name|
       next  if ServiceInfo::Base.itself_or_parent?(name)
       next  if SPECIAL_LOG_FILES.include?(name)
 
-      full_name = File.expand_path(name, dir_name)
-      stats = File.stat(full_name)
+      path = File.expand_path(name, dir_name)
+      next  unless File.readable?(path)
+
+      stats = File.stat(path)
       stat_times = [stats.ctime.utc, stats.atime.utc, stats.mtime.utc]
       min_time, max_time = stat_times.min, stat_times.max
 
@@ -24,19 +38,14 @@ class ServiceInfo::Svlogd < ServiceInfo::Base
       label = label.gsub(/[\:\s\,]/, '-').gsub(/[\\\/]/, '.')
       r << {
         :name     => name,
+        :path     => path,
         :label    => label,
         :size     => stats.size,
         :created  => min_time,
         :modified => max_time
       }
     end
-    sorted_log_files(r)
-  end
-
-  class << self
-    def log_location_cache
-      @log_location_cache ||= LogLocationCache::Svlogd.new
-    end
+    sorted_file_locations(r)
   end
 end
 

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitMan
-  VERSION = '2.4.0a1'.freeze
+  VERSION = '2.4.0a2'.freeze
 end
 

data/views/_service_info.haml

@@ -23,7 +23,7 @@
           = service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up')
   %td
     - if service_info.logged?
-      = log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', :name => service_info.name), :blank => true, :title => service_info.log_file_location)
+      = log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', :name => service_info.name), :blank => true, :title => service_info.log_file_locations.join(', '))
       = log_downloads_link(service_info.name)
     - else
       = t('runit.services.table.values.log_absent')

metadata

@@ -1,234 +1,171 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: runit-man
-version: !ruby/object:Gem::Version 
-  hash: -3194798914
+version: !ruby/object:Gem::Version
+  version: 2.4.0a2
   prerelease: 5
-  segments: 
-  - 2
-  - 4
-  - 0
-  - a
-  - 1
-  version: 2.4.0a1
 platform: ruby
-authors: 
+authors:
 - Akzhan Abdulin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-03 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2158419480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: yajl-ruby
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2158419480
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2158418760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  name: haml
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2158418760
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2158418300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  name: sinatra
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2158418300
+- !ruby/object:Gem::Dependency
+  name: sinatra-content-for2
+  requirement: &2158417420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.2.4
-  name: sinatra-content-for2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2158417420
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2158416360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
-  name: i18n
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2158416360
+- !ruby/object:Gem::Dependency
+  name: file-tail
+  requirement: &2158414440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.0.7
-  name: file-tail
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2158414440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2158413020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 0.9.0
-  name: rake
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2158413020
+- !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  requirement: &2158412020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2158412020
+- !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  requirement: &2158410660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2158410660
+- !ruby/object:Gem::Dependency
   name: rr
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  requirement: &2158410240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2158410240
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  requirement: &2158409720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2158409720
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2158408740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 1.0.10
-  name: bundler
-  requirement: *id012
-description: |
-  Simple runit (http://smarden.org/runit/) web management tool with i18n.
-  
+  type: :development
+  prerelease: false
+  version_requirements: *2158408740
+description: ! 'Simple runit (http://smarden.org/runit/) web management tool with
+  i18n.
+
+
   Server will run by runit-man script.
-  
+
+
   More information available at https://github.com/Undev/runit-man
 
+'
 email: akzhan.abdulin@gmail.com
-executables: 
+executables:
 - runit-man
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - .gitmodules
 - CHANGELOG.markdown
@@ -255,9 +192,6 @@ files:
 - lib/runit-man/app.rb
 - lib/runit-man/config.ru
 - lib/runit-man/helpers.rb
-- lib/runit-man/log_location_cache/base.rb
-- lib/runit-man/log_location_cache/logger.rb
-- lib/runit-man/log_location_cache/svlogd.rb
 - lib/runit-man/partials.rb
 - lib/runit-man/rainbows.conf
 - lib/runit-man/runner.rb
@@ -292,42 +226,34 @@ files:
 - views/log.haml
 - views/log_downloads.haml
 - views/view_file.haml
-has_rdoc: true
 homepage: https://github.com/Undev/runit-man
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1381096489065286937
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: 
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Runit web management tool.
-test_files: 
+test_files:
 - spec/functional/runit-man_spec.rb
 - spec/spec_helper.rb

data/lib/runit-man/log_location_cache/base.rb

@@ -1,110 +0,0 @@
-require 'monitor'
-
-module LogLocationCache; end
-
-class LogLocationCache::Base
-  TIME_LIMIT = 600
-
-  def initialize
-    @monitor = Monitor.new
-    clear
-  end
-
-  def [](pid)
-    pid = pid.to_i
-    loc = nil
-
-    unless pids.include?(pid)
-      loc = get_pid_location(pid)
-      set_pid_log_location(pid, loc)
-    end
-
-    return loc  unless loc.nil?
-    return nil  unless pids.include?(pid)
-
-    pids[pid][:value]
-  end
-
-protected
-  attr_accessor :query_counter
-  attr_accessor :pids
-  attr_reader   :monitor
-
-  def not_implemented
-    raise NotImplementedError.new
-  end
-
-  def get_pid_location(lpid)
-    not_implemented
-  end
-
-  def clear
-    monitor.synchronize do
-      self.query_counter = 0
-      self.pids = {}
-    end
-
-    self
-  end
-
-  def remove_old_values
-    monitor.synchronize do
-      self.query_counter = query_counter + 1
-      if query_counter < 10
-        return
-      end
-
-      self.query_counter = 0
-      limit = Time.now - TIME_LIMIT
-
-      pids.keys.each do |pid|
-        if pids[pid][:time] < limit
-          pids.delete(pid)
-        end
-      end
-    end
-
-    self
-  end
-
-  def log_command(lpid)
-    return nil  if lpid.nil?
-
-    ps_output = `ps -o args -p #{lpid} 2>&1`.split("\n")
-    return nil  if ps_output.length < 2
-
-    cmd = ps_output[1].chomp
-    cmd != '' ? cmd : nil
-  end
-
-  def logger_name
-    not_implemented
-  end
-
-  def log_command_args(lpid)
-    cmd = log_command(lpid)
-    return nil  if cmd.nil?
-
-    args = cmd.split(/\s+/).select { |arg| arg !~ /^\-/ }
-    return nil  if args.shift !~ /#{Regexp.escape(logger_name)}/
-
-    args
-  end
-
-  def log_folder_base_name(lpid)
-    args = log_command_args(lpid)
-    return nil  if args.nil?
-
-    result = args.first
-    result
-  end
-
-  def log_folder(lpid)
-    not_implemented
-  end
-
-  def set_pid_log_location(pid, log_location)
-    not_implemented
-  end
-end
-

data/lib/runit-man/log_location_cache/logger.rb

@@ -1,56 +0,0 @@
-require 'monitor'
-
-class LogLocationCache::Logger < LogLocationCache::Base
-  def initialize(logger)
-    super()
-    @logger = logger
-  end
-
-protected
-  attr_reader   :logger
-
-  def get_pid_location(lpid)
-    folder = log_folder(lpid)
-    return  nil if folder.nil?
-
-    loc = File.join(folder, Time.now.strftime('%Y-%m-%d'), "#{log_folder_base_name(lpid)}.log")
-    unless File.exists?(loc)
-      loc = "#{loc}.gz"
-      loc = nil  unless File.exists?(loc)
-    end
-
-    loc
-  end
-
-  def logger_name
-    (logger =~ /^([^\:]+)\:/) ? $1 : logger
-  end
-
-  def log_base_folder
-    (logger =~ /^[^\:]+\:([^\:]+)/) ? $1 : nil
-  end
-
-  def log_folder(lpid)
-    folder = log_folder_base_name(lpid)
-    (log_base_folder.nil? || folder.nil?) ? folder : File.join(log_base_folder, folder)
-  end
-
-  def log_priority(lpid)
-    args = log_command_args(lpid)
-    args.nil? ? logger_priority : args.last
-  end
-
-  def set_pid_log_location(pid, log_location)
-    remove_old_values
-  end
-
-  def log_folder_base_name(lpid)
-    result = super(lpid)
-
-    # we should remove : from the end of the line for logger installations.
-    result = $1  if result =~ /^(.+)\:$/
-
-    result
-  end
-end
-

data/lib/runit-man/log_location_cache/svlogd.rb

@@ -1,34 +0,0 @@
-require 'monitor'
-
-class LogLocationCache::Svlogd < LogLocationCache::Base
-
-protected
-  def get_pid_location(lpid)
-    folder = log_folder(lpid)
-    return nil  if folder.nil?
-
-    File.join(folder, 'current')
-  end
-
-  def logger_name
-    'svlogd'
-  end
-
-  def log_folder(lpid)
-    log_folder_base_name(lpid)
-  end
-
-  def set_pid_log_location(pid, log_location)
-    remove_old_values
-
-    monitor.synchronize do
-      pids[pid.to_i] = {
-        :value => log_location,
-        :time  => Time.now
-      }
-    end
-
-    self
-  end
-end
-