runit-man 2.3.21 → 2.4.0a1

data/lib/runit-man/app.rb

@@ -53,17 +53,21 @@ class RunitMan::App < Sinatra::Base
 
   def self.setup_i18n_files
     files = []
+
     Dir.glob("#{i18n_location}/*.yml") do |full_path|
-      next unless File.file?(full_path)
+      next  unless File.file?(full_path)
+
       files << full_path
     end
+
     I18n.load_path = files
     I18n.reload!
-    nil 
+    nil
   end
 
   configure do
     RunitMan::App.setup_i18n_files
+
     haml_options = { :ugly => true }
     haml_options[:encoding] = 'utf-8' if defined?(Encoding)
     set :haml, haml_options
@@ -76,16 +80,20 @@ class RunitMan::App < Sinatra::Base
     else
       ServiceInfo.klass = ServiceInfo::Logger
     end
+
     @read_write_mode = RunitMan::App.read_write_mode
     @scripts = []
+
     base_content_type = CONTENT_TYPES.keys.detect do |t|
       request.env['REQUEST_URI'] =~ /\.#{Regexp.escape(t.to_s)}$/
     end || :html
     content_type CONTENT_TYPES[base_content_type], :charset => 'utf-8'
+
     headers({
       'X-Powered-By' => 'runit-man',
       'X-Version' => RunitMan::VERSION
     })
+
     parse_language(request.env['HTTP_ACCEPT_LANGUAGE'])
   end
 
@@ -100,6 +108,7 @@ class RunitMan::App < Sinatra::Base
 
   def parse_language(header)
     weighted_locales = []
+
     if header
       header.split(',').each do |s|
         if s =~ /^(.+)\;q\=(\d(?:\.\d)?)$/
@@ -109,12 +118,15 @@ class RunitMan::App < Sinatra::Base
         end
       end
     end
+
     weighted_locales << { :locale => :en, :weight => 0.0 }
+
     if weighted_locales.length >= 2
       weighted_locales.sort! do |a, b|
         b[:weight] <=> a[:weight]
       end
     end
+
     locales = weighted_locales.map { |wl| wl[:locale] }
     setup_i18n(locales)
   end
@@ -146,7 +158,8 @@ class RunitMan::App < Sinatra::Base
     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?
+    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|
@@ -171,8 +184,10 @@ class RunitMan::App < Sinatra::Base
     if !request.GET.has_key?('file')
       return nil
     end
+
     file_path = request.GET['file']
-    return nil unless all_files_to_view.include?(file_path)
+    return nil  unless all_files_to_view.include?(file_path)
+
     text = IO.read(file_path)
     {
        :name => file_path,
@@ -182,7 +197,8 @@ class RunitMan::App < Sinatra::Base
 
   get %r[^/([^/]+)/log(?:/(\d+))?/?$] do |name, count|
     data = log_of_service(name, count, nil)
-    return not_found if data.nil?
+    return not_found  if data.nil?
+
     @title = t('runit.services.log.title', :name => name, :host => host_name, :count => count)
     haml :log, :locals => data
   end
@@ -193,15 +209,19 @@ class RunitMan::App < Sinatra::Base
     else
       count, no = nil, d1
     end
+
     no = no.to_i
+
     data = log_of_service(name, count, no)
-    return not_found if data.nil?
+    return not_found  if data.nil?
+
     data[:logs][no][:text]
   end
 
   get %r[^/([^/]+)/log\-downloads/?$] do |name|
     srv = ServiceInfo.klass[name]
-    return not_found if srv.nil? || !srv.logged?
+    return not_found  if srv.nil? || !srv.logged?
+
     haml :log_downloads, :locals => {
       :name  => name,
       :files => srv.log_files
@@ -210,17 +230,18 @@ class RunitMan::App < Sinatra::Base
 
   get %r[^/([^/]+)/log\-download/(.+)$] do |name, file_name|
     srv = ServiceInfo.klass[name]
-    return not_found if srv.nil? || !srv.logged?
+    return not_found  if srv.nil? || !srv.logged?
+
     f = srv.log_files.detect { |f| f[:name] == file_name }
-    return not_found unless f
+    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)
   end
 
   get '/view' do
     data = data_of_file_view(request)
-    if data.nil?
-      return not_found
-    end
+    return not_found  if data.nil?
+
     @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 
@@ -228,9 +249,8 @@ class RunitMan::App < Sinatra::Base
 
   get '/view.txt' do
     data = data_of_file_view(request)
-    if data.nil?
-      return not_found
-    end
+    return not_found  if data.nil?
+
     content_type CONTENT_TYPES[:txt], :charset => 'utf-8'
     data[:text]
   end
@@ -248,7 +268,8 @@ class RunitMan::App < Sinatra::Base
   post '/:name/signal/:signal' do |name, signal|
     unless readonly?
       service = ServiceInfo.klass[name]
-      return not_found if service.nil?
+      return not_found  if service.nil?
+
       service.send_signal(signal)
       log_action(name, "send signal \"#{signal}\"")
     else
@@ -261,7 +282,8 @@ class RunitMan::App < Sinatra::Base
     unless readonly?
       service = ServiceInfo.klass[name]
       action = "#{action}!".to_sym
-      return not_found if service.nil? || !service.respond_to?(action)
+      return not_found  if service.nil? || !service.respond_to?(action)
+
       service.send(action)
       log_action(name, action)
     else
@@ -288,14 +310,18 @@ class RunitMan::App < Sinatra::Base
       active_r_dir = File.join(RunitMan::App.active_services_directory, 'runit-man')
       my_dir       = File.join(GEM_FOLDER, 'sv')
       log_dir      = File.join(all_r_dir, 'log')
+
       if File.symlink?(all_r_dir)
         File.unlink(all_r_dir)
       end
+
       unless File.directory?(all_r_dir)
         FileUtils.mkdir_p(log_dir)
         create_log_run_script(all_r_dir)
       end
+
       create_run_script(all_r_dir)
+
       unless File.symlink?(active_r_dir)
         File.symlink(all_r_dir, active_r_dir)
       end
@@ -340,9 +366,11 @@ class RunitMan::App < Sinatra::Base
       auth                      = RunitMan::App.allowed_users
       rackup_command_line       = RunitMan::App.rackup_command_line
       read_write_mode           = RunitMan::App.read_write_mode.to_s
+
       File.open(script_name, 'w') do |script_source|
         script_source.print ERB.new(IO.read(template_name)).result(binding())
       end
+
       File.chmod(0755, script_name)
     end
 
@@ -351,9 +379,11 @@ class RunitMan::App < Sinatra::Base
       script_name   = File.join(dir, 'log', 'run')
       template_name = File.join(GEM_FOLDER, 'sv', 'log', 'run.erb')
       logger        = RunitMan::App.runit_logger
+
       File.open(script_name, 'w') do |script_source|
         script_source.print ERB.new(IO.read(template_name)).result(binding())
       end
+
       File.chmod(0755, script_name)
     end
   end

data/lib/runit-man/helpers.rb

@@ -72,6 +72,7 @@ module Helpers
     id    = options[:id] || false
     hint  = " title=\"#{h(hint)}\"" unless hint.empty?
     blank = blank ? ' target="_blank"' : ''
+
     "<a#{hint}#{blank} href=\"/#{name}/log#{ (count != 100) ? "/#{count}" : '' }#{ id ? "/#{id}" : ''  }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
   end
 
@@ -92,6 +93,7 @@ module Helpers
     sign = (bytes >= 0) ? '' : '-'
     suffix = 'b'
     bytes = bytes.abs.to_f
+
     if bytes > GIGABYTE
       bytes /= GIGABYTE
       suffix = 'Gb'
@@ -102,7 +104,9 @@ module Helpers
       bytes /= KILOBYTE
       suffix = 'Kb'
     end
+
     bytes = ((bytes * 100 + 0.5).to_i.to_f / 100)
+
     "#{sign}#{bytes}#{t("runit.services.log.#{suffix}")}"
   end
 
@@ -110,6 +114,7 @@ module Helpers
     s.split(/\s/).map do |s|
       if s =~ /(\w+)/
         word = $1
+
         if t("runit.services.table.subst.#{word}") !~ /translation missing/
           s.sub(word, t("runit.services.table.subst.#{word}"))
         else

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

@@ -13,12 +13,15 @@ class LogLocationCache::Base
   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)
+
+    return loc  unless loc.nil?
+    return nil  unless pids.include?(pid)
+
     pids[pid][:value]
   end
 
@@ -40,6 +43,7 @@ protected
       self.query_counter = 0
       self.pids = {}
     end
+
     self
   end
 
@@ -49,21 +53,26 @@ protected
       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?
+    return nil  if lpid.nil?
+
     ps_output = `ps -o args -p #{lpid} 2>&1`.split("\n")
-    return nil if ps_output.length < 2
+    return nil  if ps_output.length < 2
+
     cmd = ps_output[1].chomp
     cmd != '' ? cmd : nil
   end
@@ -74,15 +83,18 @@ protected
 
   def log_command_args(lpid)
     cmd = log_command(lpid)
-    return nil if cmd.nil?
+    return nil  if cmd.nil?
+
     args = cmd.split(/\s+/).select { |arg| arg !~ /^\-/ }
-    return nil if args.shift !~ /#{Regexp.escape(logger_name)}/
+    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?
+    return nil  if args.nil?
+
     result = args.first
     result
   end

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

@@ -11,12 +11,14 @@ protected
 
   def get_pid_location(lpid)
     folder = log_folder(lpid)
-    return nil if folder.nil?
+    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)
+      loc = nil  unless File.exists?(loc)
     end
+
     loc
   end
 
@@ -44,8 +46,10 @@ protected
 
   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 = $1  if result =~ /^(.+)\:$/
+
     result
   end
 end

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

@@ -5,7 +5,8 @@ class LogLocationCache::Svlogd < LogLocationCache::Base
 protected
   def get_pid_location(lpid)
     folder = log_folder(lpid)
-    return nil if folder.nil?
+    return nil  if folder.nil?
+
     File.join(folder, 'current')
   end
 
@@ -19,12 +20,14 @@ protected
 
   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

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

@@ -101,7 +101,8 @@ class ServiceInfo::Base
 
   def log_file_location
     rel_path = ServiceInfo.klass.log_location_cache[log_pid]
-    return nil if rel_path.nil?
+    return nil  if rel_path.nil?
+
     File.expand_path(rel_path, log_run_folder)
   end
 
@@ -114,14 +115,16 @@ class ServiceInfo::Base
   end
 
   def send_signal(signal)
-    return unless supervise?
+    return  unless supervise?
+
     File.open(File.join(supervise_folder, 'control'), 'w') do |f|
       f.print signal.to_s
     end
   end
 
   def files_to_view
-    return [] unless File.directory?(files_to_view_folder)
+    return []  unless File.directory?(files_to_view_folder)
+
     Dir.entries(files_to_view_folder).select do |name|
       File.symlink?(File.join(files_to_view_folder, name))
     end.map do |name|
@@ -135,7 +138,8 @@ class ServiceInfo::Base
   end
 
   def urls_to_view
-    return [] unless File.directory?(urls_to_view_folder)
+    return []  unless File.directory?(urls_to_view_folder)
+
     Dir.entries(urls_to_view_folder).select do |name|
       name =~ /\.url$/ && File.file?(File.join(urls_to_view_folder, name))
     end.map do |name|
@@ -146,7 +150,8 @@ class ServiceInfo::Base
   end
 
   def allowed_signals
-    return [] unless File.directory?(allowed_signals_folder)
+    return []  unless File.directory?(allowed_signals_folder)
+
     Dir.entries(allowed_signals_folder).reject do |name|
       ServiceInfo::Base.itself_or_parent?(name)
     end
@@ -190,12 +195,14 @@ protected
   end
 
   def data_from_file(file_name)
-    return @files[file_name] if @files.include?(file_name)
+    return @files[file_name]  if @files.include?(file_name)
+
     @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
+
     log_files.sort { |a, b| a[:created] <=> b[:created] }
   end
 
@@ -211,13 +218,15 @@ protected
     end
 
     def real_data_from_file(file_name)
-      return nil unless File.readable?(file_name)
+      return nil  unless File.readable?(file_name)
+
       if RUBY_VERSION >= '1.9'
         data = IO.read(file_name, :external_encoding => 'ASCII-8BIT')
       else
         data = IO.read(file_name)
       end
-      data.chomp! unless data.nil?
+
+      data.chomp!  unless data.nil?
       data.empty? ? nil : data
     end
 
@@ -227,7 +236,8 @@ protected
 
   private
     def active_service_names
-      return [] unless File.directory?(RunitMan::App.active_services_directory)
+      return []  unless File.directory?(RunitMan::App.active_services_directory)
+
       Dir.entries(RunitMan::App.active_services_directory).reject do |name|
         full_name = File.join(RunitMan::App.active_services_directory, name)
         itself_or_parent?(name) || (!File.symlink?(full_name) && !File.directory?(full_name))
@@ -235,8 +245,10 @@ protected
     end
 
     def inactive_service_names
-      return [] unless File.directory?(RunitMan::App.all_services_directory)
+      return []  unless File.directory?(RunitMan::App.all_services_directory)
+
       actives = active_service_names
+
       Dir.entries(RunitMan::App.all_services_directory).reject do |name|
         full_name = File.join(RunitMan::App.all_services_directory, name)
         itself_or_parent?(name) || !File.directory?(full_name) || actives.include?(name)

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

@@ -5,37 +5,44 @@ 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)
-    loc = "#{loc}.gz" unless File.exists?(loc)
-    loc = nil unless File.exists?(loc)
+
+    loc = "#{loc}.gz"  unless File.exists?(loc)
+    loc = nil  unless File.exists?(loc)
+
     loc
   end
 
   def log_files
     lfloc = log_file_location
     return []  if lfloc.nil?
+
+    dir_name = File.expand_path(File.dirname(File.dirname(lfloc)))
+    return []  unless File.directory?(dir_name)
+
     r = []
-    dir_name = File.dirname(File.dirname(lfloc))
-    Dir.foreach(dir_name) do |name|
-      next  if ServiceInfo::Base.itself_or_parent?(name)
-      full_name = File.expand_path(name, dir_name)
-      next  unless File.directory?(full_name)
-      file_name = File.join(full_name, "#{self.name}.log")
-      label = "#{Utils.host_name}-#{self.name}-#{name}.log"
-      unless File.exists?(file_name)
-        file_name = "#{file_name}.gz"
-        label = "#{label}.gz"
+    Dir.foreach(dir_name) do |subdirname|
+      next  if ServiceInfo::Base.itself_or_parent?(subdirname)
+      subdirpath = File.expand_path(subdirname, dir_name)
+      next  unless File.directory?(subdirpath)
+
+      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)
+        stat_times = [stats.ctime.utc, stats.atime.utc, stats.mtime.utc]
+        min_time, max_time = stat_times.min, stat_times.max
+
+        r << {
+          :name     => name,
+          :label    => label,
+          :size     => stats.size,
+          :created  => min_time,
+          :modified => max_time
+        }
       end
-      stats = File.stat(file_name)
-      stat_times = [stats.ctime.utc, stats.atime.utc, stats.mtime.utc]
-      min_time, max_time = stat_times.min, stat_times.max
-
-      r << {
-        :name     => name,
-        :label    => label,
-        :size     => stats.size,
-        :created  => min_time,
-        :modified => max_time
-      }
     end
     sorted_log_files(r)
   end
@@ -45,6 +52,5 @@ class ServiceInfo::Logger < ServiceInfo::Base
       @log_location_cache ||= LogLocationCache::Logger.new(RunitMan::App.runit_logger)
     end
   end
-
 end
 

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

@@ -14,6 +14,7 @@ class ServiceInfo::Svlogd < ServiceInfo::Base
     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)
       stat_times = [stats.ctime.utc, stats.atime.utc, stats.mtime.utc]
@@ -33,13 +34,9 @@ class ServiceInfo::Svlogd < ServiceInfo::Base
   end
 
   class << self
-
     def log_location_cache
       @log_location_cache ||= LogLocationCache::Svlogd.new
     end
-
   end
-
-
 end
 

data/lib/runit-man/service_status.rb

@@ -9,6 +9,7 @@ class ServiceStatus
     # status in daemontools supervise format
     # look at runit's sv.c for details
     data = (!data.nil? && data.length == STATUS_SIZE) ? data : nil
+
     @raw = data.nil? ? nil : data.unpack('NNxxxxVxa1CC')
   end
 
@@ -54,12 +55,13 @@ class ServiceStatus
   end
 
   def to_s
-    return 'inactive' if inactive?
+    return 'inactive'  if inactive?
+
     # try to mimics stat behaviour to minimize readings
     result = status_string
-    result += ', got TERM' if got_term?
-    result += ', want down' if want_down?
-    result += ', want up' if want_up?
+    result += ', got TERM'  if got_term?
+    result += ', want down'  if want_down?
+    result += ', want up'  if want_up?
     result 
   end
 
@@ -70,9 +72,9 @@ private
 
   def status_string
     case status_byte
-      when S_DOWN then 'down'
-      when S_RUN then 'run'
-      when S_FINISH then 'finish'
+      when S_DOWN; 'down'
+      when S_RUN; 'run'
+      when S_FINISH; 'finish'
     end
   end
 end

data/lib/runit-man/utils.rb

@@ -11,6 +11,7 @@ class Utils
           @host_name = Socket.gethostname
         end
       end
+
       @host_name
     end
 

data/lib/runit-man/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 41
-  prerelease: 
+  hash: -3194798914
+  prerelease: 5
   segments: 
   - 2
-  - 3
-  - 21
-  version: 2.3.21
+  - 4
+  - 0
+  - a
+  - 1
+  version: 2.4.0a1
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-28 00:00:00 +04:00
+date: 2012-04-03 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -311,12 +313,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: