runit-man 1.5.0 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/runit-man/app.rb +2 -1
- data/lib/runit-man/service_info.rb +10 -10
- data/sv/run.erb +1 -1
- metadata +2 -2
data/lib/runit-man/app.rb
CHANGED
|
@@ -156,7 +156,8 @@ class RunitMan < Sinatra::Base
|
|
|
156
156
|
:active_services_directory => RunitMan.active_services_directory,
|
|
157
157
|
:port => RunitMan.port,
|
|
158
158
|
:bind => RunitMan.respond_to?(:bind) ? RunitMan.bind : nil,
|
|
159
|
-
:server => RunitMan.server
|
|
159
|
+
:server => RunitMan.server,
|
|
160
|
+
:files_to_view => RunitMan.files_to_view
|
|
160
161
|
)
|
|
161
162
|
end
|
|
162
163
|
File.chmod(0755, script_name)
|
|
@@ -20,7 +20,7 @@ class ServiceInfo
|
|
|
20
20
|
end
|
|
21
21
|
|
|
22
22
|
def stat
|
|
23
|
-
r = data_from_file(File.join(supervise_folder, 'stat'))
|
|
23
|
+
r = ServiceInfo.data_from_file(File.join(supervise_folder, 'stat'))
|
|
24
24
|
r ? r : 'inactive'
|
|
25
25
|
end
|
|
26
26
|
|
|
@@ -59,11 +59,11 @@ class ServiceInfo
|
|
|
59
59
|
end
|
|
60
60
|
|
|
61
61
|
def pid
|
|
62
|
-
data_from_file(File.join(supervise_folder, 'pid'))
|
|
62
|
+
ServiceInfo.data_from_file(File.join(supervise_folder, 'pid'))
|
|
63
63
|
end
|
|
64
64
|
|
|
65
65
|
def log_pid
|
|
66
|
-
data_from_file(File.join(log_supervise_folder, 'pid'))
|
|
66
|
+
ServiceInfo.data_from_file(File.join(log_supervise_folder, 'pid'))
|
|
67
67
|
end
|
|
68
68
|
|
|
69
69
|
def log_file_location
|
|
@@ -102,13 +102,6 @@ private
|
|
|
102
102
|
File.directory?(supervise_folder)
|
|
103
103
|
end
|
|
104
104
|
|
|
105
|
-
def data_from_file(file_name)
|
|
106
|
-
return nil unless File.readable?(file_name)
|
|
107
|
-
r = IO.read(file_name)
|
|
108
|
-
r = r.chomp unless r.nil?
|
|
109
|
-
r.empty? ? nil : r
|
|
110
|
-
end
|
|
111
|
-
|
|
112
105
|
class << self
|
|
113
106
|
def all
|
|
114
107
|
all_service_names.sort.map do |name|
|
|
@@ -127,6 +120,13 @@ private
|
|
|
127
120
|
@log_location_cache
|
|
128
121
|
end
|
|
129
122
|
|
|
123
|
+
def data_from_file(file_name)
|
|
124
|
+
return nil unless File.readable?(file_name)
|
|
125
|
+
data = IO.read(file_name)
|
|
126
|
+
data.chomp! unless data.nil?
|
|
127
|
+
data.empty? ? nil : data
|
|
128
|
+
end
|
|
129
|
+
|
|
130
130
|
private
|
|
131
131
|
def itself_or_parent?(name)
|
|
132
132
|
name == '.' || name == '..'
|
data/sv/run.erb
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/bin/sh
|
|
2
2
|
exec 2>&1
|
|
3
|
-
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 %>"
|
|
3
|
+
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 %>
|