runit-man 1.4.6 → 1.4.7

data/i18n/en.yml

@@ -34,3 +34,4 @@ runit:
       counts: "Show %1 lines of log"
       updated: "Page updated at %1"
       reload: Reload
+      raw: Raw

data/i18n/ru.yml

@@ -36,3 +36,4 @@ runit:
       counts: "Показать %1 строк лога"
       updated: "Страница обновлена %1"
       reload: Обновить страницу
+      raw: Текст

data/lib/runit-man/app.rb

@@ -10,6 +10,7 @@ MAX_TAIL      = 10000
 GEM_FOLDER    = File.expand_path(File.join('..', '..'), File.dirname(__FILE__)).freeze
 CONTENT_TYPES = {
   :html => 'text/html',
+  :txt  => 'text/plain',
   :css  => 'text/css',
   :js   => 'application/x-javascript',
   :json => 'application/json'
@@ -32,12 +33,9 @@ class RunitMan < Sinatra::Base
   end
 
   before do
-    base_content_type = case request.env['REQUEST_URI']
-      when /\.css$/  then :css
-      when /\.js$/   then :js
-      when /\.json$/ then :json
-      else                :html
-    end
+    base_content_type = CONTENT_TYPES.keys.detect do |t|
+      request.env['REQUEST_URI'] =~ /\.#{Regexp.escape(t.to_s)}$/
+    end || :html
     content_type CONTENT_TYPES[base_content_type], :charset => 'utf-8'
   end
 
@@ -55,15 +53,13 @@ class RunitMan < Sinatra::Base
     service_infos.to_json
   end
 
-  get %r[/([^/]+)/log(?:/(\d+))?] do |name, count|
+  def log_of_service(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), h(count), h(srv.log_file_location))
-    erb :log, :locals => {
+    return nil if srv.nil? || !srv.logged?
+    {
       :name         => name,
       :count        => count,
       :log_location => srv.log_file_location,
@@ -71,6 +67,20 @@ class RunitMan < Sinatra::Base
     }
   end
 
+  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]))
+    erb :log, :locals => data
+  end
+
+  get %r[^/([^/]+)/log(?:/(\d+))?\.txt$] do |name, count|
+    data = log_of_service(name, count)
+    return not_found if data.nil?
+    data[:text]
+  end
+
   def log_action(name, text)
     env  = request.env
     addr = env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']

data/lib/runit-man/helpers.rb

@@ -39,9 +39,10 @@ module Helpers
     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}" : '' }#footer\">#{h(title)}</a>"
+    "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
   end
 
   def even_or_odd

data/views/log.erb

@@ -1,5 +1,6 @@
 <% content_for :content do %>
-    <%= t.runit.services.log.header(h(name), h(host_name), h(count), h(log_location)) %>
+    <%= 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(' ')) %>
     </p>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 6
-  version: 1.4.6
+  - 7
+  version: 1.4.7
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 +04:00
+date: 2010-04-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency