runit-man 2.4.8 → 2.4.9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changes
 
+### Version 2.4.9
+
+* Updates of logger policy - demofly
+* Knowledge about terabytes - demofly
+
 ### Version 2.4.8
 
 * Twitter Bootstrap updated to 2.1.1.

data/i18n/en.yml

@@ -73,10 +73,11 @@ en:
         file_name: File name
         file_size: File size
         about_utc: All times for log files are represented in UTC.
-        b: b
-        Kb: Kb
-        Mb: Mb
-        Gb: Gb
+        B: B
+        KB: KB
+        MB: MB
+        GB: GB
+        TB: TB
     view_file:
       raw: Raw
       title: 'File %{file} on %{host}'

data/i18n/ru.yml

@@ -75,10 +75,11 @@ ru:
         file_name: Имя файла
         file_size: Размер файла
         about_utc: Все времена для файлов представлены в формате UTC.
-        b: б
-        Kb: Кб
-        Mb: Мб
-        Gb: Гб
+        B: Б
+        KB: КБ
+        MB: МБ
+        GB: ГБ
+        TB: ТБ
     view_file:
       raw: Текст
       title: 'Файл %{file} на %{host}'

data/lib/runit-man/app.rb

@@ -243,11 +243,11 @@ class RunitMan::App < Sinatra::Base
     }
   end
 
-  get %r[\A/([^/]+)/log\-download/(.+)\z] do |name, file_name|
+  get %r[\A/([^/]+)/log\-download/((.+)/)(.+)\z] do |name, file_date_wd, file_date, file_name|
     srv = ServiceInfo.klass[name]
     return not_found  if srv.nil? || !srv.logged?
 
-    f = srv.all_log_file_locations.detect { |f| f[:name] == file_name }
+    f = srv.all_log_file_locations.detect { |f| ( f[:name] == file_name ) && ( f[:subdir] == file_date ) }
     return not_found  unless f
 
     send_file(f[:path], :type => 'text/plain', :disposition => 'attachment', :filename => f[:label], :last_modified => f[:modified].httpdate)

data/lib/runit-man/helpers.rb

@@ -87,22 +87,26 @@ module Helpers
 
   KILOBYTE = 1024
   MEGABYTE = 1024 * KILOBYTE
-  GIGABYTE =  1024 * MEGABYTE
+  GIGABYTE = 1024 * MEGABYTE
+  TERABYTE = 1024 * GIGABYTE
 
   def human_bytes(bytes)
     sign = (bytes >= 0) ? '' : '-'
-    suffix = 'b'
+    suffix = 'B'
     bytes = bytes.abs.to_f
 
-    if bytes > GIGABYTE
+    if bytes >= TERABYTE
+      bytes /= TERABYTE
+      suffix = 'TB'
+    elsif bytes >= GIGABYTE
       bytes /= GIGABYTE
-      suffix = 'Gb'
-    elsif bytes > MEGABYTE
+      suffix = 'GB'
+    elsif bytes >= MEGABYTE
       bytes /= MEGABYTE
-      suffix = 'Mb'
-    elsif bytes > KILOBYTE
+      suffix = 'MB'
+    elsif bytes >= KILOBYTE
       bytes /= KILOBYTE
-      suffix = 'Kb'
+      suffix = 'KB'
     end
 
     bytes = ((bytes * 100 + 0.5).to_i.to_f / 100)

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

@@ -71,6 +71,7 @@ class ServiceInfo::Logger < ServiceInfo::Base
         r << {
           :name     => filename,
           :path     => filepath,
+          :subdir   => subdirname,
           :label    => label,
           :size     => stats.size,
           :created  => min_time,

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

@@ -45,6 +45,7 @@ class ServiceInfo::Svlogd < ServiceInfo::Base
       r << {
         :name     => name,
         :path     => path,
+        :subdir   => "",
         :label    => label,
         :size     => stats.size,
         :created  => min_time,

data/lib/runit-man/version.rb

@@ -1,6 +1,6 @@
 # runit-man namespace.
 module RunitMan
   # runit-man version.
-  VERSION = '2.4.8'.freeze
+  VERSION = '2.4.9'.freeze
 end
 

data/views/log_downloads.haml

@@ -18,6 +18,7 @@
           %td= h(f[:label])
           %td{:title=>h(f[:size])}= h(human_bytes(f[:size]))
           %td
-            %a{:href=>"/#{h(name)}/log-download/#{h(f[:name])}"}
+            - filenamewithsubdir = f[:subdir] ? h(f[:subdir])+'/'+h(f[:name]) : h(f[:name])
+            %a{:href=>"/#{h(name)}/log-download/#{filenamewithsubdir}"}
               = h(t('runit.services.log.download'))
               …

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runit-man
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -340,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3318638847420459700
+      hash: 375963765489978018
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3318638847420459700
+      hash: 375963765489978018
 requirements:
 - none
 rubyforge_project: