runit-man 1.8.3 → 1.8.4

data/i18n/en.yml

@@ -26,6 +26,7 @@ runit:
         down: <span class="down">down<span>
         finish: <span class="down">finish<span>
         run: <span class="run">run<span>
+        up: <span class="run">up<span>
       actions:
         start: Start
         stop: Stop

data/i18n/ru.yml

@@ -26,6 +26,7 @@ runit:
         down: <span class="down">остановлен</span>
         finish: <span class="down">останавливается</span>
         run: <span class="run">работает</span>
+        up: <span class="run">поднятие</span>
         got: получен
         want: ожидается
       actions:

data/lib/runit-man/service_info.rb

@@ -36,8 +36,7 @@ class ServiceInfo
   end
 
   def stat
-    r = data_from_file(File.join(supervise_folder, 'stat'))
-    r ? r : 'inactive'
+    @status.inactive? ? 'inactive' : @status.to_s
   end
 
   def active?
@@ -227,7 +226,6 @@ private
     def all_service_names
       (active_service_names + inactive_service_names)
     end
-
   end
 end
 

data/lib/runit-man/service_status.rb

@@ -1,52 +1,78 @@
-class ServiceStatus
-  def initialize(data)
-    # status in daemontools supervise format
-    # look at runit's sv.c for details
-    data = !data.nil? && data.length == 20 ? data : nil
-    @raw = data.nil? ? nil : data.unpack('NNxxxxVxa1CC')
-  end
-
-  def down?
-    status_byte == 0
-  end
-
-  def run?
-    status_byte == 1
-  end
-
-  def finish?
-    status_byte == 2
-  end
-
-  def pid
-    @pid ||= down? ? nil : @raw[2]
-  end
-
-  def started_at
-    # from TAI to Unix
-    @started_at ||= @raw ? Time.at((@raw[0] << 32) + @raw[1] - 4611686018427387914) : nil
-  end
-
-  def uptime
-    @uptime ||= down? ? nil : Time.now - started_at
-  end
-
-  def want_up?
-    @raw && !pid && @raw[3] == 'u'
-  end
-
-  def want_down?
-    pid && @raw[3] == 'd'
-  end
-
-  def got_term?
-    pid && @raw[4] != 0
-  end
-
-private
-  def status_byte
-    @status_byte ||= @raw ? @raw[5] : 0
-  end
-
-end
-
+class ServiceStatus
+  STATUS_SIZE = 20
+  # state
+  S_DOWN      = 0
+  S_RUN       = 1
+  S_FINISH    = 2
+
+  def initialize(data)
+    # status in daemontools supervise format
+    # look at runit's sv.c for details
+    data = (!data.nil? && data.length == STATUS_SIZE) ? data : nil
+    @raw = data.nil? ? nil : data.unpack('NNxxxxVxa1CC')
+  end
+
+  def inactive?
+    @raw.nil?
+  end
+
+  def down?
+    status_byte == S_DOWN
+  end
+
+  def run?
+    status_byte == S_RUN
+  end
+
+  def finish?
+    status_byte == S_FINISH
+  end
+
+  def pid
+    @pid ||= down? ? nil : @raw[2]
+  end
+
+  def started_at
+    # from TAI to Unix
+    @started_at ||= @raw ? Time.at((@raw[0] << 32) + @raw[1] - 4611686018427387914) : nil
+  end
+
+  def uptime
+    @uptime ||= down? ? nil : Time.now - started_at
+  end
+
+  def want_up?
+    @raw && !pid && @raw[3] == 'u'
+  end
+
+  def want_down?
+    pid && @raw[3] == 'd'
+  end
+
+  def got_term?
+    pid && @raw[4] != 0
+  end
+
+  def to_s
+    # try to mimics stat behaviour to minimize readings
+    result = status_string
+    result += ', got TERM' if got_term?
+    result += ', want down' if want_down?
+    result += ', want up' if want_up?
+    result 
+  end
+
+private
+  def status_byte
+    @status_byte ||= @raw ? @raw[5] : 0
+  end
+
+  def status_string
+    case status_byte
+      when S_DOWN then 'down'
+      when S_RUN then 'run'
+      when S_FINISH then 'finish'
+    end
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 3
-  version: 1.8.3
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Akzhan Abdulin