runit-man 1.9.8 → 1.10.0

data/i18n/en.yml

@@ -53,6 +53,15 @@ runit:
       updated: "Page updated at %1"
       reload: Reload
       raw: Raw
+      downloads: Log downloads
+      download: Download
+      modified: Last modified
+      file_name: File name
+      file_size: File size
+      b: b
+      Kb: Kb
+      Mb: Mb
+      Gb: Gb
   view_file:
     raw: Raw
     title: 'File %1 on %2'

data/i18n/ru.yml

@@ -55,6 +55,15 @@ runit:
       updated: "Страница обновлена %1"
       reload: Обновить страницу
       raw: Текст
+      downloads: Загрузка логов
+      download: Скачать
+      modified: Последнее изменение
+      file_name: Имя файла
+      file_size: Размер файла
+      b: б
+      Kb: Кб
+      Mb: Мб
+      Gb: Гб
   view_file:
     raw: Текст
     title: 'Файл %1 на %2'

data/lib/runit-man/app.rb

@@ -33,6 +33,7 @@ class RunitMan < Sinatra::Base
   end
 
   before do
+    @scripts = []
     base_content_type = CONTENT_TYPES.keys.detect do |t|
       request.env['REQUEST_URI'] =~ /\.#{Regexp.escape(t.to_s)}$/
     end || :html
@@ -70,11 +71,29 @@ class RunitMan < Sinatra::Base
   get %r[^/([^/]+)/log(?:/(\d+))?/?$] do |name, count|
     data = log_of_service(name, count)
     return not_found if data.nil?
-    @scripts = []
     @title = t.runit.services.log.title(h(name), h(host_name), h(count), h(data[:log_location]))
     erubis :log, :locals => data
   end
 
+  get %r[^/([^/]+)/log\-downloads/?$] do |name|
+    srv = ServiceInfo[name]
+    return not_found if srv.nil? || !srv.logged?
+    erubis :log_downloads, :locals => {
+      :name  => name,
+      :files => srv.log_files
+    }
+  end
+
+  get %r[^/([^/]+)/log\-download/(.+)$] do |name, file_name|
+    srv = ServiceInfo[name]
+    return not_found if srv.nil? || !srv.logged?
+    f = srv.log_files.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 => "#{name}-#{file_name}.txt", :last_modified => f[:modified].httpdate)
+  end
+
+
+
   get %r[^/([^/]+)/log(?:/(\d+))?\.txt$] do |name, count|
     data = log_of_service(name, count)
     return not_found if data.nil?
@@ -98,7 +117,6 @@ class RunitMan < Sinatra::Base
     if data.nil?
       return not_found
     end
-    @scripts = []
     @title = t.runit.view_file.title(h(data[:name]), h(host_name))
     content_type CONTENT_TYPES[:html], :charset => 'utf-8'
     erubis :view_file, :locals => data 

data/lib/runit-man/helpers.rb

@@ -68,11 +68,37 @@ module Helpers
     "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
   end
 
+  def log_downloads_link(name)
+    "<a target=\"_blank\" href=\"/#{h(name)}/log-downloads\/\">#{h(t.runit.services.log.downloads)}&hellip;</a>"
+  end
+
   def even_or_odd
     self.even_or_odd_state = !even_or_odd_state
     even_or_odd_state
   end
 
+  KILOBYTE = 1024
+  MEGABYTE = 1024 * KILOBYTE
+  GIGABYTE =  1024 * MEGABYTE
+
+  def human_bytes(bytes)
+    sign = (bytes >= 0) ? '' : '-'
+    suffix = 'b'
+    bytes = bytes.abs.to_f
+    if bytes > GIGABYTE
+      bytes /= GIGABYTE
+      suffix = 'Gb'
+    elsif bytes > MEGABYTE
+      bytes /= MEGABYTE
+      suffix = 'Mb'
+    elsif bytes > KILOBYTE
+      bytes /= KILOBYTE
+      suffix = 'Kb'
+    end
+    bytes = ((bytes * 100 + 0.5).to_i.to_f / 100)
+    "#{sign}#{bytes}#{t.runit.services.log[suffix]}"
+  end
+
   def stat_subst(s)
     s.split(/\s/).map do |s|
       if s =~ /(\w+)/ && t.runit.services.table.subst[$1].translated?

data/lib/runit-man/service_info.rb

@@ -2,6 +2,8 @@ require 'runit-man/log_location_cache'
 require 'runit-man/service_status'
 
 class ServiceInfo
+  SPECIAL_LOG_FILES = %w(lock config).freeze
+
   attr_reader :name
 
   def initialize(a_name)
@@ -99,6 +101,30 @@ class ServiceInfo
     File.expand_path(rel_path, log_run_folder)
   end
 
+  def log_file_path(file_name)
+    dir_name = File.dirname(log_file_location)
+    File.expand_path(file_name, dir_name)
+  end
+
+  def log_files
+    r = []
+    dir_name = File.dirname(log_file_location)
+    Dir.foreach(dir_name) do |name|
+      next if ServiceInfo.itself_or_parent?(name)
+      next if SPECIAL_LOG_FILES.include?(name)
+      full_name = File.expand_path(name, dir_name)
+      r << {
+        :name => name,
+        :size => File.size(full_name),
+        :modified => File.mtime(full_name)
+      }
+    end
+    if r.length >= 2
+      r.sort! { |a, b| a[:modified] <=> b[:modified] }
+    end
+    r
+  end
+
   def send_signal(signal)
     return unless supervise?
     File.open(File.join(supervise_folder, 'control'), 'w') do |f|

data/views/_service_info.erubis

@@ -28,6 +28,7 @@ need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_vi
   <td>
     <% if service_info.logged? %>
       <%= log_link(service_info.name, :hint => t.runit.services.table.values.log_hint(service_info.name), :blank => true, :title => service_info.log_file_location) %>
+      <%= log_downloads_link(service_info.name) %>
     <% else %>
       <%= t.runit.services.table.values.log_absent %>
     <% end %>

data/views/layout.erubis

@@ -19,11 +19,13 @@
         <%= yield_content :content %>
       </div>
 
+<% if content_for?(:footer) %>
       <div id="footer">
         <div class="content">
           <%= yield_content :footer %>
         </div>
       </div>
+<% end %>
 
     </div>
   <% @scripts.each do |name| %>

data/views/log.erubis

@@ -2,7 +2,9 @@
     <%= t.runit.services.log.header(h(name), h(host_name), h(count), h(log_location)) %> | <%= log_link(name, :count => count, :title => t.runit.services.log.raw, :raw => true) %>
 
     <p>
-       <%= t.runit.services.log.counts([100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
+      <%= t.runit.services.log.counts([100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
+      <%= log_downloads_link(name) %>
+
     </p>
     <pre><%= h(text) %></pre>
 <% end %>

data/views/log_downloads.erubis

@@ -0,0 +1,24 @@
+<% content_for :content do %>
+<h2><%= h(name) %></h2>
+<h3><%= h(t.runit.services.log.downloads) %></h3>
+<table>
+  <caption><%= h(name + ': ' + t.runit.services.log.downloads) %></caption>
+  <thead>
+    <tr>
+      <th><%= h(t.runit.services.log.modified) %></th>
+      <th><%= h(t.runit.services.log.file_name) %></th>
+      <th><%= h(t.runit.services.log.file_size) %></th>
+      <th></th>
+     </tr>
+  </thead>
+  <tbody>
+  <% files.each do |f| %>
+    <tr class="<%= even_or_odd ? 'even' : 'odd' %>">
+      <td title="<%= h(l(f[:modified], :full)) %>"><%= h(l(f[:modified], :human)) %></td>
+      <td><%= h(f[:name]) %></td>
+      <td title="<%= h(f[:size]) %>"><%= h(human_bytes(f[:size])) %></td>
+      <td><a href="/<%= h(name) %>/log-download/<%= h(f[:name]) %>"><%= h(t.runit.services.log.download) %>&hellip;</a></td>
+    </tr>
+  <% end %>
+  </tbody>
+<% end %>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 35
   prerelease: false
   segments: 
   - 1
-  - 9
-  - 8
-  version: 1.9.8
+  - 10
+  - 0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +03:00
+date: 2011-02-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -69,10 +65,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -83,7 +80,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 4
@@ -99,7 +95,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,7 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -127,7 +121,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -141,7 +134,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -184,6 +176,7 @@ files:
 - views/index.erubis
 - views/layout.erubis
 - views/log.erubis
+- views/log_downloads.erubis
 - views/view_file.erubis
 - i18n/en.yml
 - i18n/ru.yml
@@ -203,7 +196,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -212,7 +204,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"