runit-man 1.5.0 → 1.5.1

data/lib/runit-man/app.rb

@@ -156,7 +156,8 @@ class RunitMan < Sinatra::Base
           :active_services_directory => RunitMan.active_services_directory,
           :port                      => RunitMan.port,
           :bind                      => RunitMan.respond_to?(:bind) ? RunitMan.bind : nil,
-          :server                    => RunitMan.server
+          :server                    => RunitMan.server,
+          :files_to_view             => RunitMan.files_to_view
         )
       end
       File.chmod(0755, script_name)

data/lib/runit-man/service_info.rb

@@ -20,7 +20,7 @@ class ServiceInfo
   end
 
   def stat
-    r = data_from_file(File.join(supervise_folder, 'stat'))
+    r = ServiceInfo.data_from_file(File.join(supervise_folder, 'stat'))
     r ? r : 'inactive'
   end
 
@@ -59,11 +59,11 @@ class ServiceInfo
   end
 
   def pid
-    data_from_file(File.join(supervise_folder, 'pid'))
+    ServiceInfo.data_from_file(File.join(supervise_folder, 'pid'))
   end
 
   def log_pid
-    data_from_file(File.join(log_supervise_folder, 'pid'))
+    ServiceInfo.data_from_file(File.join(log_supervise_folder, 'pid'))
   end
 
   def log_file_location
@@ -102,13 +102,6 @@ private
     File.directory?(supervise_folder)
   end
 
-  def data_from_file(file_name)
-    return nil unless File.readable?(file_name)
-    r = IO.read(file_name)
-    r = r.chomp unless r.nil?
-    r.empty? ? nil : r
-  end
-
   class << self
     def all
       all_service_names.sort.map do |name|
@@ -127,6 +120,13 @@ private
       @log_location_cache
     end
 
+    def data_from_file(file_name)
+      return nil unless File.readable?(file_name)
+      data = IO.read(file_name)
+      data.chomp! unless data.nil?
+      data.empty? ? nil : data
+    end
+
   private
     def itself_or_parent?(name)
       name == '.' || name == '..'

data/sv/run.erb

@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec runit-man<% if server.kind_of?(String) %> -s "<%= server %>"<% end %><% if bind %> -b <%= bind %><% end %> -p <%= port %> -a "<%= active_services_directory %>" -f "<%= all_services_directory %>"
+exec runit-man<% if server.kind_of?(String) %> -s "<%= server %>"<% end %><% if bind %> -b <%= bind %><% end %> -p <%= port %> -a "<%= active_services_directory %>" -f "<%= all_services_directory %>"<% files_to_view.each do |f| %> -v "<%= f %>"<% end %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Akzhan Abdulin