runit-man 2.4.0 → 2.4.1a1

data/README.md

@@ -38,13 +38,19 @@ This tool can provide additional information or actions through it's Web page.
 ### View names and content of files that related to concrete service
 
 For each known runit service this tool looks for `./runit-man/files-to-view/` folder.
-Every symlink here will be shown as link to view target file content.
+Every symlink there will be shown as link to view target file content.
 
 ### Show links that related to concrete service
 
 For each known runit service this tool looks for `./runit-man/urls-to-view/` folder.
 Every file ended with .url will be shown as link to view target location (location should be written as content of this file).
 
+### Indicate services with any of watched files are modified since service startup
+
+For each known runit service this tool looks for `./runit-man/files-to-watch/` folder.
+Symlink targets there will be tested for its mtime to be less than service start time.
+Service will be indicated as dangerous (as red color) to restart if any watched file is modified since service startup.
+
 ### Show buttons that send signals to concrete service
 
 For each known runit service this tool looks for `./runit-man/allowed-signals/` folder.

data/README_ru.md

@@ -39,6 +39,12 @@ runit-man -p 14500 -r
 Для каждого известного сервиса runit эта утилита просматривает каталог `./runit-man/files-to-view/`.
 Каждый симлинк в этом каталоге будет показан как ссылка на просмотр содержимого целевого файла.
 
+### Индикация сервисов, чьи файлы для наблюдения изменились после старта
+
+Для каждого известного сервиса runit эта утилита просматривает каталог `./runit-man/files-to-watch/`.
+Целевые файлы симлинков в этом каталоге будут проверяться на время последней модификации файла.
+Сервис будет помечаться как опасный (красным цветом) в плане рестарта, если любой наблюдаемый файл изменился после старта сервиса.
+
 ### Показ ссылок, относящихся к конкретному сервису
 
 Для каждого известного сервиса runit эта утилита просматривает каталог `./runit-man/urls-to-view/`.

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

@@ -18,7 +18,7 @@ class ServiceInfo::Base
     data = {}
     [
       :name, :stat, :active?, :logged?, :switchable?,
-      :log_file_location, :log_pid 
+      :log_file_location, :log_pid, :restart_dangerous?
     ].each do |sym|
       data[sym] = send(sym)
     end
@@ -109,6 +109,13 @@ class ServiceInfo::Base
     []
   end
 
+  def restart_dangerous?
+    ! ! files_to_watch.detect do |file|
+      mtime = File.stat(file).mtime
+      mtime > @status.started_at
+    end
+  end
+
   def send_signal(signal)
     return  unless supervise?
 
@@ -117,19 +124,27 @@ class ServiceInfo::Base
     end
   end
 
-  def files_to_view
-    return []  unless File.directory?(files_to_view_folder)
+  def symlinks_to_file_paths(dir_path)
+    return []  unless File.directory?(dir_path)
 
-    Dir.entries(files_to_view_folder).select do |name|
-      File.symlink?(File.join(files_to_view_folder, name))
+    Dir.entries(dir_path).select do |name|
+      File.symlink?(File.join(dir_path, name))
     end.map do |name|
       File.expand_path(
-        File.readlink(File.join(files_to_view_folder, name)),
-        files_to_view_folder
+        File.readlink(File.join(dir_path, name)),
+        dir_path
       )
     end.select do |file_path|
       File.file?(file_path)
-    end 
+    end
+  end
+
+  def files_to_view
+    symlinks_to_file_paths(files_to_view_folder)
+  end
+
+  def files_to_watch
+    symlinks_to_file_paths(files_to_watch_folder)
   end
 
   def urls_to_view
@@ -165,6 +180,10 @@ protected
     File.join(active_service_folder, 'runit-man', 'files-to-view')
   end
 
+  def files_to_watch_folder
+    File.join(active_service_folder, 'runit-man', 'files-to-watch')
+  end
+
   def urls_to_view_folder
     File.join(active_service_folder, 'runit-man', 'urls-to-view')
   end

data/lib/runit-man/service_status.rb

@@ -1,43 +1,58 @@
+# Represents service status in daemontools supervise format.
+# @ note see runit's sv.c source code for details.
 class ServiceStatus
+  # Size of status data in bytes
   STATUS_SIZE = 20
-  # state
+  # Service is down.
   S_DOWN      = 0
+  # Service is running.
   S_RUN       = 1
+  # Service is finishing.
   S_FINISH    = 2
 
+  # Initializes serice status by binary data.
+  # @param [String] data Binary data of service status in daemontools supervise format.
   def initialize(data)
-    # 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
 
+  # Is service inactive?
   def inactive?
     @raw.nil?
   end
 
+  # Is service down?
   def down?
     status_byte == S_DOWN
   end
 
+  # Is service running?
   def run?
     status_byte == S_RUN
   end
 
+  # Is service finishing?
   def finish?
     status_byte == S_FINISH
   end
 
+  # Gets service process id.
+  # @return [Fixnum] Process id.
   def pid
     @pid ||= down? ? nil : @raw[2]
   end
 
+  # Gets service start time.
+  # @return [Time] Service start time.
   def started_at
     # from TAI to Unix
     @started_at ||= @raw ? Time.at((@raw[0] << 32) + @raw[1] - 4611686018427387914) : nil
   end
 
+  # Gets service uptime in seconds.
+  # @return [Float] Service uptime in seconds if running; otherwise nil.
   def uptime
     @uptime ||= down? ? nil : Time.now - started_at
   end

data/lib/runit-man/version.rb

@@ -1,6 +1,6 @@
 # runit-man namespace.
 module RunitMan
   # runit-man version.
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1a1'.freeze
 end
 

data/public/css/runit-man.css

@@ -20,6 +20,7 @@ form.service-action, form.service-signal
 span.inactive {color:gray;}
 span.down {color:#8a1f11;}
 span.run {color:#264409;}
+span.danger {color:red;}
 
 #services { text-align: center; }
 

data/views/_service_info.haml

@@ -1,7 +1,9 @@
 - need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_view.empty?
 %tr{:class=> even_or_odd ? 'even' : 'odd'}
   %td{:rowspan=> need_second_row ? 2 : 1}= h(service_info.pid)
-  %th{:scope=>"row"}= h(service_info.name)
+  %th{:scope=>"row"}
+    %span{:class=>service_info.restart_dangerous? ? "danger" : "ok"}
+      = h(service_info.name)
   %td= service_info.started_at ? service_info.started_at.utc : ''
   %td= service_info.uptime ? ('%.2f' % service_info.uptime) : ''
   %td= stat_subst(service_info.stat)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: runit-man
 version: !ruby/object:Gem::Version
-  version: 2.4.0
-  prerelease: 
+  version: 2.4.1a1
+  prerelease: 5
 platform: ruby
 authors:
 - Akzhan Abdulin
@@ -13,7 +13,7 @@ date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2153692900 !ruby/object:Gem::Requirement
+  requirement: &2160877420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153692900
+  version_requirements: *2160877420
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153692360 !ruby/object:Gem::Requirement
+  requirement: &2160876900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153692360
+  version_requirements: *2160876900
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153691880 !ruby/object:Gem::Requirement
+  requirement: &2160876320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153691880
+  version_requirements: *2160876320
 - !ruby/object:Gem::Dependency
   name: sinatra-content-for2
-  requirement: &2153691360 !ruby/object:Gem::Requirement
+  requirement: &2160875660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153691360
+  version_requirements: *2160875660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153690820 !ruby/object:Gem::Requirement
+  requirement: &2160875100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2153690820
+  version_requirements: *2160875100
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &2153690260 !ruby/object:Gem::Requirement
+  requirement: &2160874360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153690260
+  version_requirements: *2160874360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153689620 !ruby/object:Gem::Requirement
+  requirement: &2160872720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2153689620
+  version_requirements: *2160872720
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2153688780 !ruby/object:Gem::Requirement
+  requirement: &2160872000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153688780
+  version_requirements: *2160872000
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2153688140 !ruby/object:Gem::Requirement
+  requirement: &2160871240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153688140
+  version_requirements: *2160871240
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2153686480 !ruby/object:Gem::Requirement
+  requirement: &2160870740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153686480
+  version_requirements: *2160870740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153685940 !ruby/object:Gem::Requirement
+  requirement: &2160870100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153685940
+  version_requirements: *2160870100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153685060 !ruby/object:Gem::Requirement
+  requirement: &2160869460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2153685060
+  version_requirements: *2160869460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153683440 !ruby/object:Gem::Requirement
+  requirement: &2160868120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2153683440
+  version_requirements: *2160868120
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2153682560 !ruby/object:Gem::Requirement
+  requirement: &2160866780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +170,7 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *2153682560
+  version_requirements: *2160866780
 description: ! 'Simple runit (http://smarden.org/runit/) web management tool with
   i18n.
 
@@ -265,16 +265,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2528648994926986438
+      hash: 706955117803235190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2528648994926986438
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: