runit-man 1.4.5 → 1.4.6

data/i18n/en.yml

@@ -29,7 +29,8 @@ runit:
         switch_down: Deactivate
         switch_up: Activate
     log:
-      title: "Tail 100 lines of service %1 log - %2"
-      header: "Tail 100 lines of service <strong>%1</strong> log: %2"
+      title: "Tail %3 lines of service %1 log - %2"
+      header: "Tail %3 lines of service <strong>%1</strong> log: %2 (<code>%4</code>)"
+      counts: "Show %1 lines of log"
       updated: "Page updated at %1"
       reload: Reload

data/i18n/ru.yml

@@ -31,7 +31,8 @@ runit:
         switch_down: Выключить
         switch_up: Включить
     log:
-      title: "Последние 100 строк лога сервиса %1 - %2"
-      header: "Последние 100 строк лога сервиса <strong>%1</strong>: %2"
+      title: "Последние %3 строк лога сервиса %1 - %2"
+      header: "Последние %3 строк лога сервиса <strong>%1</strong>: %2 (<code>%4</code>)"
+      counts: "Показать %1 строк лога"
       updated: "Страница обновлена %1"
       reload: Обновить страницу

data/lib/runit-man/app.rb

@@ -5,10 +5,9 @@ require 'sinatra/r18n'
 require 'runit-man/erb-to-erubis'
 require 'runit-man/helpers'
 
-R18n::Filters.on :variables
-
-GEM_FOLDER = File.expand_path(File.join('..', '..'), File.dirname(__FILE__)).freeze
-
+MIN_TAIL      = 100
+MAX_TAIL      = 10000
+GEM_FOLDER    = File.expand_path(File.join('..', '..'), File.dirname(__FILE__)).freeze
 CONTENT_TYPES = {
   :html => 'text/html',
   :css  => 'text/css',
@@ -16,6 +15,7 @@ CONTENT_TYPES = {
   :json => 'application/json'
 }.freeze
 
+R18n::Filters.on :variables
 
 class RunitMan < Sinatra::Base
   set :environment,  :production
@@ -55,14 +55,19 @@ class RunitMan < Sinatra::Base
     service_infos.to_json
   end
 
-  get '/:name/log' do |name|
-    srv = ServiceInfo[name]
+  get %r[/([^/]+)/log(?:/(\d+))?] do |name, count|
+    count = count.to_i
+    count = MIN_TAIL if count < MIN_TAIL
+    count = MAX_TAIL if count > MAX_TAIL
+    srv   = ServiceInfo[name]
     return not_found if srv.nil? || !srv.logged?
     @scripts = []
-    @title = t.runit.services.log.title(h(name), h(host_name))
+    @title = t.runit.services.log.title(h(name), h(host_name), h(count), h(srv.log_file_location))
     erb :log, :locals => {
-      :name => name,
-      :text => `tail -n 100 #{srv.log_file_location}`
+      :name         => name,
+      :count        => count,
+      :log_location => srv.log_file_location,
+      :text         => `tail -n #{count} #{srv.log_file_location}`
     }
   end
 

data/lib/runit-man/helpers.rb

@@ -34,6 +34,16 @@ module Helpers
     }
   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  || ''
+    hint  = " title=\"#{h(hint)}\"" unless hint.empty?
+    blank = blank ? ' target="_blank"' : ''
+    "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#footer\">#{h(title)}</a>"
+  end
+
   def even_or_odd
     self.even_or_odd_state = !even_or_odd_state
     even_or_odd_state

data/sv/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec runit-man -b 0.0.0.0 -p 14230 -a "/etc/service" -f "/etc/sv"

data/views/_service_info.erb

@@ -21,7 +21,7 @@
   </td>
   <td>
     <% if service_info.logged? %>
-      <a title="<%= h(t.runit.services.table.values.log_hint(service_info.name)) %>" target="_blank" rel="nofollow" href="/<%= h(service_info.name) %>/log#footer"><%= h(service_info.log_file_location) %></a>
+      <%= log_link(service_info.name, :hint => t.runit.services.table.values.log_hint(service_info.name), :blank => true, :title => service_info.log_file_location) %>
     <% else %>
       <%= t.runit.services.table.values.log_absent %>
     <% end %>

data/views/log.erb

@@ -1,5 +1,8 @@
 <% content_for :content do %>
-    <%= t.runit.services.log.header(h(name), h(host_name)) %>
+    <%= t.runit.services.log.header(h(name), h(host_name), h(count), h(log_location)) %>
+    <p>
+       <%= t.runit.services.log.counts([100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
+    </p>
     <pre><%= h(text) %></pre>
 <% end %>
 <% content_for :footer do %>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  version: 1.4.5
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -9,99 +14,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +03:00
+date: 2010-04-01 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: erubis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra-content-for
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: r18n-core
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.2
-    version: 
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra-r18n
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rr
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 description: |
   Simple runit (http://smarden.org/runit/) web management tool with i18n.
   
@@ -138,6 +151,7 @@ files:
 - views/_service_info.erb
 - i18n/ru.yml
 - i18n/en.yml
+- sv/run
 - sv/log/run
 - sv/run.erb
 has_rdoc: true
@@ -153,18 +167,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Runit web management tool.