runit-man 1.7.4 → 1.8.0

data/i18n/en.yml

@@ -32,6 +32,19 @@ runit:
         restart: Restart
         switch_down: Deactivate
         switch_up: Activate
+      signals:
+        t: TERM
+        k: KILL
+        i: INT
+        1: USR1
+        2: USR2
+        a: ALARM
+        q: QUIT
+        x: EXIT
+        p: PAUSE
+        c: CONT
+        h: HUP
+        o: ONCE
     log:
       title: "Tail %3 lines of service %1 log - %2"
       header: "Tail %3 lines of service <strong>%1</strong> log: %2 (<code>%4</code>)"

data/i18n/ru.yml

@@ -34,6 +34,19 @@ runit:
         restart: Перезапустить
         switch_down: Выключить
         switch_up: Включить
+      signals:
+        t: TERM
+        k: KILL
+        i: INT
+        1: USR1
+        2: USR2
+        a: ALARM
+        q: QUIT
+        x: EXIT
+        p: PAUSE
+        c: CONT
+        h: HUP
+        o: ONCE
     log:
       title: "Последние %3 строк лога сервиса %1 - %2"
       header: "Последние %3 строк лога сервиса <strong>%1</strong>: %2 (<code>%4</code>)"

data/lib/runit-man/helpers.rb

@@ -1,76 +1,84 @@
-require 'socket'
-require 'runit-man/service_info'
-require 'runit-man/partials'
-require 'sinatra/content_for'
-
-module Helpers
-  include Rack::Utils
-  include Sinatra::Partials
-  include Sinatra::ContentFor
-  alias_method :h, :escape_html
-
-  attr_accessor :even_or_odd_state
-
-  def host_name
-    unless @host_name
-      begin
-        @host_name = Socket.gethostbyname(Socket.gethostname).first
-      rescue
-        @host_name = Socket.gethostname
-      end
-    end
-    @host_name
-  end
-
-  def service_infos
-    ServiceInfo.all
-  end
-
-  def files_to_view
-    RunitMan.files_to_view.map do |f|
-      File.symlink?(f) ? File.expand_path(File.readlink(f), File.dirname(f)) : f
-    end.select do |f|
-      File.readable?(f)
-    end.uniq.sort
-  end
-
-  def all_files_to_view
-    (files_to_view + service_infos.map do |service|
-      service.files_to_view
-    end.flatten).uniq.sort
-  end
-
-  def service_action(name, action, label)
-    partial :service_action, :locals => {
-      :name   => name,
-      :action => action,
-      :label  => label
-    }
-  end
-
-  def log_link(name, options = {})
-    count = (options[:count] || 100).to_i
-    title = options[:title].to_s || count
-    blank = options[:blank] || false
-    hint  = options[:hint].to_s  || ''
-    raw   = options[:raw] || false
-    hint  = " title=\"#{h(hint)}\"" unless hint.empty?
-    blank = blank ? ' target="_blank"' : ''
-    "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
-  end
-
-  def even_or_odd
-    self.even_or_odd_state = !even_or_odd_state
-    even_or_odd_state
-  end
-
-  def stat_subst(s)
-    s.split(/\s/).map do |s|
-      if s =~ /(\w+)/ && t.runit.services.table.subst[$1].translated?
-        s.sub(/\w+/, t.runit.services.table.subst[$1].to_s)
-      else
-        s
-      end
-    end.join(' ')
-  end
-end
+require 'socket'
+require 'runit-man/service_info'
+require 'runit-man/partials'
+require 'sinatra/content_for'
+
+module Helpers
+  include Rack::Utils
+  include Sinatra::Partials
+  include Sinatra::ContentFor
+  alias_method :h, :escape_html
+
+  attr_accessor :even_or_odd_state
+
+  def host_name
+    unless @host_name
+      begin
+        @host_name = Socket.gethostbyname(Socket.gethostname).first
+      rescue
+        @host_name = Socket.gethostname
+      end
+    end
+    @host_name
+  end
+
+  def service_infos
+    ServiceInfo.all
+  end
+
+  def files_to_view
+    RunitMan.files_to_view.map do |f|
+      File.symlink?(f) ? File.expand_path(File.readlink(f), File.dirname(f)) : f
+    end.select do |f|
+      File.readable?(f)
+    end.uniq.sort
+  end
+
+  def all_files_to_view
+    (files_to_view + service_infos.map do |service|
+      service.files_to_view
+    end.flatten).uniq.sort
+  end
+
+  def service_action(name, action, label)
+    partial :service_action, :locals => {
+      :name   => name,
+      :action => action,
+      :label  => label
+    }
+  end
+
+  def service_signal(name, signal, label)
+    partial :service_signal, :locals => {
+      :name   => name,
+      :signal => signal,
+      :label  => label
+    }
+  end
+
+  def log_link(name, options = {})
+    count = (options[:count] || 100).to_i
+    title = options[:title].to_s || count
+    blank = options[:blank] || false
+    hint  = options[:hint].to_s  || ''
+    raw   = options[:raw] || false
+    hint  = " title=\"#{h(hint)}\"" unless hint.empty?
+    blank = blank ? ' target="_blank"' : ''
+    "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
+  end
+
+  def even_or_odd
+    self.even_or_odd_state = !even_or_odd_state
+    even_or_odd_state
+  end
+
+  def stat_subst(s)
+    s.split(/\s/).map do |s|
+      if s =~ /(\w+)/ && t.runit.services.table.subst[$1].translated?
+        s.sub(/\w+/, t.runit.services.table.subst[$1].to_s)
+      else
+        s
+      end
+    end.join(' ')
+  end
+end

data/lib/runit-man/service_info.rb

@@ -1,222 +1,233 @@
-require 'runit-man/log_location_cache'
-require 'runit-man/service_status'
-
-class ServiceInfo
-  attr_reader :name
-
-  def initialize(a_name)
-    @name   = a_name
-    @files  = {}
-
-    @status = ServiceStatus.new(data_from_file(File.join(supervise_folder, 'status')))
-    @log_status = ServiceStatus.new(data_from_file(File.join(log_supervise_folder, 'status')))
-  end
-
-  def to_json(*a)
-    data = {}
-    [
-      :name, :stat, :active?, :logged?, :switchable?,
-      :log_file_location, :log_pid 
-    ].each do |sym|
-      data[sym] = send(sym)
-    end
-
-    [
-      :run?, :pid, :finish?, :down?,
-      :want_up?, :want_down?, :got_term?,
-      :started_at, :uptime
-    ].each do |sym|
-      data[sym] = @status.send(sym)
-    end
-    data.to_json(*a)
-  end
-
-  def logged?
-    File.directory?(log_supervise_folder)
-  end
-
-  def stat
-    r = data_from_file(File.join(supervise_folder, 'stat'))
-    r ? r : 'inactive'
-  end
-
-  def active?
-    File.directory?(active_service_folder) || File.symlink?(active_service_folder)
-  end
-
-  def switchable?
-    File.symlink?(active_service_folder) || File.directory?(inactive_service_folder)
-  end
-
-  def down?
-    @status.down?
-  end
-
-  def run?
-    @status.run?
-  end
-
-  def up!
-    send_signal :u
-  end
-
-  def down!
-    send_signal :d
-  end
-
-  def switch_down!
-    down!
-    File.unlink(active_service_folder)
-  end
-
-  def switch_up!
-    File.symlink(inactive_service_folder, active_service_folder)
-  end
-
-  def restart!
-    down!
-    up!
-  end
-
-  def pid
-    @status.pid
-  end
-
-  def uptime
-    @status.uptime
-  end
-
-  def log_pid
-    @log_status.pid
-  end
-
-  def log_file_location
-    rel_path = self.class.log_location_cache[log_pid]
-    return nil if rel_path.nil?
-    File.expand_path(rel_path, log_run_folder)
-  end
-
-  def send_signal(signal)
-    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)
-    Dir.entries(files_to_view_folder).select do |name|
-      File.symlink?(File.join(files_to_view_folder, name))
-    end.map do |name|
-      File.expand_path(
-        File.readlink(File.join(files_to_view_folder, name)),
-        files_to_view_folder
-      )
-    end.select do |file_path|
-      File.file?(file_path)
-    end 
-  end
-
-  def urls_to_view
-    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|
-      data_from_file(File.join(urls_to_view_folder, name))
-    end.select do |url|
-      !url.nil?
-    end
-  end
-
-private
-  def inactive_service_folder
-    File.join(RunitMan.all_services_directory, name)
-  end
-
-  def active_service_folder
-    File.join(RunitMan.active_services_directory, name)
-  end
-
-  def files_to_view_folder
-    File.join(active_service_folder, 'runit-man', 'files-to-view')
-  end
-
-  def urls_to_view_folder
-    File.join(active_service_folder, 'runit-man', 'urls-to-view')
-  end
-
-  def supervise_folder
-    File.join(active_service_folder, 'supervise')
-  end
-
-  def log_run_folder
-    File.join(active_service_folder, 'log')
-  end
-
-  def log_supervise_folder
-    File.join(log_run_folder, 'supervise')
-  end
-
-  def supervise?
-    File.directory?(supervise_folder)
-  end
-
-  def data_from_file(file_name)
-    return @files[file_name] if @files.include?(file_name)
-    @files[file_name] = self.class.real_data_from_file(file_name)
-  end
-
-  class << self
-    def all
-      all_service_names.sort.map do |name|
-        ServiceInfo.new(name)
-      end
-    end
-
-    def [](name)
-      all_service_names.include?(name) ? ServiceInfo.new(name) : nil
-    end
-
-    def log_location_cache
-      unless @log_location_cache
-        @log_location_cache = LogLocationCache.new
-      end
-      @log_location_cache
-    end
-
-    def real_data_from_file(file_name)
-      return nil unless File.readable?(file_name)
-      data = IO.read(file_name)
-      data.chomp! unless data.nil?
-      data.empty? ? nil : data
-    end
-
-  private
-    def itself_or_parent?(name)
-      name == '.' || name == '..'
-    end
-
-    def active_service_names
-      return [] unless File.directory?(RunitMan.active_services_directory)
-      Dir.entries(RunitMan.active_services_directory).reject do |name|
-        full_name = File.join(RunitMan.active_services_directory, name)
-        itself_or_parent?(name) || (!File.symlink?(full_name) && !File.directory?(full_name))
-      end
-    end
-
-    def inactive_service_names
-      return [] unless File.directory?(RunitMan.all_services_directory)
-      actives = active_service_names
-      Dir.entries(RunitMan.all_services_directory).reject do |name|
-        full_name = File.join(RunitMan.all_services_directory, name)
-        itself_or_parent?(name) || !File.directory?(full_name) || actives.include?(name)
-      end
-    end
-
-    def all_service_names
-      (active_service_names + inactive_service_names)
-    end
-
-  end
-end
-
+require 'runit-man/log_location_cache'
+require 'runit-man/service_status'
+
+class ServiceInfo
+  attr_reader :name
+
+  def initialize(a_name)
+    @name   = a_name
+    @files  = {}
+
+    @status = ServiceStatus.new(data_from_file(File.join(supervise_folder, 'status')))
+    @log_status = ServiceStatus.new(data_from_file(File.join(log_supervise_folder, 'status')))
+  end
+
+  def to_json(*a)
+    data = {}
+    [
+      :name, :stat, :active?, :logged?, :switchable?,
+      :log_file_location, :log_pid 
+    ].each do |sym|
+      data[sym] = send(sym)
+    end
+
+    [
+      :run?, :pid, :finish?, :down?,
+      :want_up?, :want_down?, :got_term?,
+      :started_at, :uptime
+    ].each do |sym|
+      data[sym] = @status.send(sym)
+    end
+    data.to_json(*a)
+  end
+
+  def logged?
+    File.directory?(log_supervise_folder)
+  end
+
+  def stat
+    r = data_from_file(File.join(supervise_folder, 'stat'))
+    r ? r : 'inactive'
+  end
+
+  def active?
+    File.directory?(active_service_folder) || File.symlink?(active_service_folder)
+  end
+
+  def switchable?
+    File.symlink?(active_service_folder) || File.directory?(inactive_service_folder)
+  end
+
+  def down?
+    @status.down?
+  end
+
+  def run?
+    @status.run?
+  end
+
+  def up!
+    send_signal :u
+  end
+
+  def down!
+    send_signal :d
+  end
+
+  def switch_down!
+    down!
+    File.unlink(active_service_folder)
+  end
+
+  def switch_up!
+    File.symlink(inactive_service_folder, active_service_folder)
+  end
+
+  def restart!
+    down!
+    up!
+  end
+
+  def pid
+    @status.pid
+  end
+
+  def uptime
+    @status.uptime
+  end
+
+  def log_pid
+    @log_status.pid
+  end
+
+  def log_file_location
+    rel_path = ServiceInfo.log_location_cache[log_pid]
+    return nil if rel_path.nil?
+    File.expand_path(rel_path, log_run_folder)
+  end
+
+  def send_signal(signal)
+    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)
+    Dir.entries(files_to_view_folder).select do |name|
+      File.symlink?(File.join(files_to_view_folder, name))
+    end.map do |name|
+      File.expand_path(
+        File.readlink(File.join(files_to_view_folder, name)),
+        files_to_view_folder
+      )
+    end.select do |file_path|
+      File.file?(file_path)
+    end 
+  end
+
+  def urls_to_view
+    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|
+      data_from_file(File.join(urls_to_view_folder, name))
+    end.select do |url|
+      !url.nil?
+    end
+  end
+
+  def allowed_signals
+    return [] unless File.directory?(allowed_signals_folder)
+    Dir.entries(allowed_signals_folder).reject do |name|
+      ServiceInfo.itself_or_parent?(name)
+    end
+  end
+
+private
+  def inactive_service_folder
+    File.join(RunitMan.all_services_directory, name)
+  end
+
+  def active_service_folder
+    File.join(RunitMan.active_services_directory, name)
+  end
+
+  def files_to_view_folder
+    File.join(active_service_folder, 'runit-man', 'files-to-view')
+  end
+
+  def urls_to_view_folder
+    File.join(active_service_folder, 'runit-man', 'urls-to-view')
+  end
+
+  def allowed_signals_folder
+    File.join(active_service_folder, 'runit-man', 'allowed-signals')
+  end
+
+  def supervise_folder
+    File.join(active_service_folder, 'supervise')
+  end
+
+  def log_run_folder
+    File.join(active_service_folder, 'log')
+  end
+
+  def log_supervise_folder
+    File.join(log_run_folder, 'supervise')
+  end
+
+  def supervise?
+    File.directory?(supervise_folder)
+  end
+
+  def data_from_file(file_name)
+    return @files[file_name] if @files.include?(file_name)
+    @files[file_name] = ServiceInfo.real_data_from_file(file_name)
+  end
+
+  class << self
+    def all
+      all_service_names.sort.map do |name|
+        ServiceInfo.new(name)
+      end
+    end
+
+    def [](name)
+      all_service_names.include?(name) ? ServiceInfo.new(name) : nil
+    end
+
+    def log_location_cache
+      unless @log_location_cache
+        @log_location_cache = LogLocationCache.new
+      end
+      @log_location_cache
+    end
+
+    def real_data_from_file(file_name)
+      return nil unless File.readable?(file_name)
+      data = IO.read(file_name)
+      data.chomp! unless data.nil?
+      data.empty? ? nil : data
+    end
+
+    def itself_or_parent?(name)
+      name == '.' || name == '..'
+    end
+
+  private
+    def active_service_names
+      return [] unless File.directory?(RunitMan.active_services_directory)
+      Dir.entries(RunitMan.active_services_directory).reject do |name|
+        full_name = File.join(RunitMan.active_services_directory, name)
+        itself_or_parent?(name) || (!File.symlink?(full_name) && !File.directory?(full_name))
+      end
+    end
+
+    def inactive_service_names
+      return [] unless File.directory?(RunitMan.all_services_directory)
+      actives = active_service_names
+      Dir.entries(RunitMan.all_services_directory).reject do |name|
+        full_name = File.join(RunitMan.all_services_directory, name)
+        itself_or_parent?(name) || !File.directory?(full_name) || actives.include?(name)
+      end
+    end
+
+    def all_service_names
+      (active_service_names + inactive_service_names)
+    end
+
+  end
+end
+

data/public/css/runit-man.css

@@ -1,22 +1,22 @@
-form.service-action
-{
-  display: inline;
-}
-#container{margin:0 auto;border-top:0;width:900px;border-top:0;}
-.content{position:relative;padding: 16px 0;color:#c0baba;font-size:1.27em;line-height:1.7}
-.content:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-.content{display:inline-block;}
-/* \*/ * html .content{height:1%;}.content{display:block;}/* */
+form.service-action, form.service-signal
+{
+  display: inline;
+}
+#container{margin:0 auto;border-top:0;width:900px;border-top:0;}
+.content{position:relative;padding: 16px 0;color:#c0baba;font-size:1.27em;line-height:1.7}
+.content:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.content{display:inline-block;}
+/* \*/ * html .content{height:1%;}.content{display:block;}/* */
+
+#error { display: none; }
+.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
+.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
+.error a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
 
-#error { display: none; }
-.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
-.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
-.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
-.error a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-
-span.inactive {color:#gray;}
-span.down {color:#8a1f11;}
-span.run {color:#264409;}
+span.inactive {color:#gray;}
+span.down {color:#8a1f11;}
+span.run {color:#264409;}

data/public/js/runit-man.js

@@ -1,66 +1,66 @@
-(function($)
-{
-    var REFRESH_SERVICES_TIMEOUT = 5000;
-
-    $.ajaxSetup({
-        error: function(e, req, options, error)
-        {
-            $('#url').text(settings.url);
-            $('#error').show();
-        }
-    });
-
-    var needRefreshServices;
-    var refreshServices = function()
-    {
-        refreshServices.timer = null;
-        $.ajax({
-            url: '/services',
-            cache: false,
-            error: function()
-            {
-                $('#url').text('/services');
-                $('#error').show();
-            },
-            success: function(html)
-            {
-                $('#error').hide();
-                $('#services').html(html);
-            },
-            complete: function()
-            {
-                needRefreshServices(false);
-            }
-        });
-    };
-
-    needRefreshServices = function(now)
-    {
-        if (refreshServices.timer != null)
-        {
-            clearTimeout(refreshServices.timer);
-            refreshServices.timer = null;
-        }
-        if (now)
-        {
-            refreshServices();
-        }
-        else
-        {
-            refreshServices.timer = setTimeout(refreshServices, REFRESH_SERVICES_TIMEOUT);
-        }
-    };
-
-    $('#services').delegate('form.service-action', 'submit', function()
-    {
-        $.post($(this).attr('action'), function(data)
-        {
-            needRefreshServices(true);
-        });
-        return false;
-    });
-
-    $('#service-refresh-interval').text(REFRESH_SERVICES_TIMEOUT / 1000);
-
-    needRefreshServices(true);
-})(jQuery);
+(function($)
+{
+    var REFRESH_SERVICES_TIMEOUT = 5000;
+
+    $.ajaxSetup({
+        error: function(e, req, options, error)
+        {
+            $('#url').text(settings.url);
+            $('#error').show();
+        }
+    });
+
+    var needRefreshServices;
+    var refreshServices = function()
+    {
+        refreshServices.timer = null;
+        $.ajax({
+            url: '/services',
+            cache: false,
+            error: function()
+            {
+                $('#url').text('/services');
+                $('#error').show();
+            },
+            success: function(html)
+            {
+                $('#error').hide();
+                $('#services').html(html);
+            },
+            complete: function()
+            {
+                needRefreshServices(false);
+            }
+        });
+    };
+
+    needRefreshServices = function(now)
+    {
+        if (refreshServices.timer != null)
+        {
+            clearTimeout(refreshServices.timer);
+            refreshServices.timer = null;
+        }
+        if (now)
+        {
+            refreshServices();
+        }
+        else
+        {
+            refreshServices.timer = setTimeout(refreshServices, REFRESH_SERVICES_TIMEOUT);
+        }
+    };
+
+    $('#services').delegate('form.service-action,form.service-signal', 'submit', function()
+    {
+        $.post($(this).attr('action'), function(data)
+        {
+            needRefreshServices(true);
+        });
+        return false;
+    });
+
+    $('#service-refresh-interval').text(REFRESH_SERVICES_TIMEOUT / 1000);
+
+    needRefreshServices(true);
+})(jQuery);

data/views/_service_info.erb

@@ -11,6 +11,9 @@ need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_vi
       <% unless service_info.down? %>
         <%= service_action service_info.name, :restart, t.runit.services.table.actions.restart %>
         <%= service_action service_info.name, :down, t.runit.services.table.actions.stop %>
+        <% service_info.allowed_signals.each do |signal| %>
+          <%= service_signal service_info.name, signal, t.runit.services.table.signals[signal] %>
+        <% end %>
       <% else %>
         <%= service_action service_info.name, :up, t.runit.services.table.actions.start %>
       <% end %>
@@ -31,7 +34,7 @@ need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_vi
     <% end %>
   </td>
 </tr>
-<% if need_second_row %><tr><td colspan="4">
+<% if need_second_row %><tr><td colspan="5">
 <% unless service_info.files_to_view.empty? %>
   <%= h(t.runit.services.table.values.files_to_view) %>:
   <% service_info.files_to_view.each do |f| %>

data/views/_service_signal.erb

@@ -0,0 +1,3 @@
+<form class="service-signal" action="<%= h(name) %>/signal/<%= h(signal) %>" method="POST">
+    <input type="submit" value="<%= h(label) %>" />
+</form>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 4
-  version: 1.7.4
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +04:00
+date: 2010-05-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,6 +150,7 @@ files:
 - views/layout.erb
 - views/view_file.erb
 - views/index.erb
+- views/_service_signal.erb
 - views/_services.erb
 - views/_service_action.erb
 - views/_service_info.erb