runit-man 2.0.2 → 2.0.6

data/lib/runit-man/app.rb

@@ -20,8 +20,9 @@ class RunitMan < Sinatra::Base
     :js   => 'application/x-javascript',
     :json => 'application/json'
   }.freeze
+  DEFAULT_LOGGER = 'svlogd'.freeze
 
-	set :logger_option, 'svlogd'
+	set :logger_option, DEFAULT_LOGGER
   set :environment,   :production
   set :static,        true
   set :logging,       true
@@ -239,16 +240,12 @@ class RunitMan < Sinatra::Base
       @files_to_view ||= []
     end
 
-    def logger
-      'svlogd'
-		end
-
     def allowed_users
       @allowed_users ||= {}
     end
 
     def logger
-      settings.logger_option || 'svlogd'
+      settings.logger_option || DEFAULT_LOGGER
     end
 
     def prepare_to_run

data/lib/runit-man/log_location_cache.rb

@@ -43,8 +43,10 @@ private
   def get_pid_location(lpid)
     folder = log_folder(lpid)
     return nil if folder.nil?
-    return File.join(folder, 'current') if logger == 'svlogd'
-    File.join(folder, Time.now.strftime('%Y-%m-%d'), "#{log_folder_base_name(lpid)}.log") # TODO: may be UTC?
+    return File.join(folder, 'current') if logger == RunitMan::DEFAULT_LOGGER
+    loc = File.join(folder, Time.now.strftime('%Y-%m-%d'), "#{log_folder_base_name(lpid)}.log")
+    loc = "#{loc}.gz" unless File.exists?(loc)
+    loc
   end
 
   def log_command(lpid)

data/lib/runit-man/service_info.rb

@@ -113,12 +113,14 @@ class ServiceInfo
 
   def logger_log_file_path(file_name)
     dir_name = File.dirname(File.dirname(log_file_location))
-    File.expand_path(File.join(file_name, "#{name}.log"), dir_name)
+    loc = File.expand_path(File.join(file_name, "#{name}.log"), dir_name)
+    loc = "#{loc}.gz" unless File.exists?(loc)
+    loc
   end
 
   def log_file_path(file_name)
     case RunitMan.logger
-    when 'svlogd' then svlogd_log_file_path(file_name)
+    when RunitMan::DEFAULT_LOGGER then svlogd_log_file_path(file_name)
     when /^logger(?:\:.+)?/ then logger_log_file_path(file_name)
     else nil
     end
@@ -156,8 +158,13 @@ class ServiceInfo
       full_name = File.expand_path(name, dir_name)
       next unless File.directory?(full_name)
       file_name = File.join(full_name, "#{self.name}.log")
-      stats = File.stat(file_name)
       label = "#{Utils.host_name}-#{self.name}-#{name}.log"
+      unless File.exists?(file_name)
+        file_name = "#{file_name}.gz"
+        label = "#{label}.gz"
+      end
+      stats = File.stat(file_name)
+
       r << {
         :name     => name,
         :label    => label,
@@ -174,7 +181,7 @@ class ServiceInfo
 
   def log_files
     case RunitMan.logger
-    when 'svlogd' then svlogd_log_files
+    when RunitMan::DEFAULT_LOGGER then svlogd_log_files
     when /^logger(?:\:.+)?/ then logger_log_files
     else []
     end

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.6'.freeze
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +04:00
+date: 2011-04-07 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency