ducksboard_reporter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f166259ade7200cbecbe4b6c47afebab9ec0168
-  data.tar.gz: b4c7a1700503fb55d363461d70069f35f39fafc4
+  metadata.gz: a4fbafb079a9f649c86561507e1b17825d5634dc
+  data.tar.gz: c63cf5b41bf246be7f18388d8d659e4178b21441
 SHA512:
-  metadata.gz: e9c0f3bacc413c914382430327ed53dc1e23eacb800aa69c0c363c6fc667b70261d77e1a8393775b6bd8d9ac210581155ac285a9776fc0a52669aab5432154ac
-  data.tar.gz: 7a83efa936333b143b766f3df60043a858ba3623a66a0517779362ab74c349e562a5ab6cf8b03fe9ae91ac317c1cb1b5e69b1d3f3c1582085947886a1a37c429
+  metadata.gz: 822a3d67bf1bac56c65ea0f0e73f75c412d3722038c27f9eccba3eb2bb2c3d7f7d0e1e8dab6c4a0d17fa8f3721b0bb380d60586b3cad57b0bf91761f28fc10fa
+  data.tar.gz: 4a7707a5cbea6ccdac83e25b826d09aea74fd93daee64f2036c08a74cc7401db5813f2f7a0fd1f1719dee77b2e0dedda090f722b6877f60299cde8e4c8b0d128

data/example_config.yml

@@ -8,7 +8,7 @@ reporters:
   - name: haproxy_log_requests
     type: HaproxyLogRequests
     options:
-      log_file: /var/log/haproxy.log
+      log_file: haproxy.log
 
 widgets:
   - type: Box

data/lib/ducksboard_reporter/file_tail.rb

@@ -0,0 +1,59 @@
+module DucksboardReporter
+  class FileTail
+
+    attr_accessor :value, :timestamp, :name, :options
+
+    def initialize(path)
+      @path = path
+      @timestamp = Time.now.to_i
+    end
+
+    def run
+      open_file
+
+      while true do
+        if (current_time = Time.now.to_i) > @timestamp # flush every second
+          @every_second_block.call(current_time)
+          @timestamp = current_time
+        end
+
+        IO.select([@file])
+        line = @file.gets
+
+        if line
+          @line_block.call(line)
+        else
+          raise Errno::ENOENT unless File.exists?(@path)
+          sleep 0.001
+        end
+      end
+    rescue Errno::ENOENT
+      sleep 0.1
+      retry
+    end
+
+    def every_second(&block)
+      @every_second_block = block
+    end
+
+    def on_line(&block)
+      @line_block = block
+    end
+
+    private
+
+    def open_file
+      if @file && !@file.closed?
+        if File.stat(@path).ino == @file.stat.ino
+          return
+        else
+          @file.close
+        end
+      end
+
+      @file = File.open(@path, "r")
+      @file.seek(0, IO::SEEK_END)
+    end
+  end
+end
+

data/lib/ducksboard_reporter/reporters/haproxy_log_requests.rb

@@ -9,37 +9,29 @@ module DucksboardReporter
         nosrvs = 0
 
         begin
-          file = File.open(options[:log_file], "r")
+          tail = FileTail.new(options[:log_file])
         rescue Errno::ENOENT
-          error("HaproxyLogRequests: Cannot open #{options[:log_file]}")
+          error("HaproxyLogRequests: Log file does not exist #{options[:log_file]}")
           return
         end
 
-        file.seek(0, IO::SEEK_END)
-        @timestamp = Time.now.to_i
-
-        while true do
-          if (current_time = Time.now.to_i) > @timestamp # flush every second
-            @requests, requests = requests, 0
-            @nosrvs, nosrvs = nosrvs, 0
-            @timestamp = current_time
-          end
-
-          IO.select([file])
-          line = file.gets
+        tail.every_second do
+          @requests, requests = requests, 0
+          @nosrvs, nosrvs = nosrvs, 0
+        end
 
+        tail.on_line do |line|
           case line
           when /NOSRV/
             nosrvs += 1
           when /./
             requests += 1
-          else
-            sleep 0.1
           end
         end
+
+        tail.run
       end
     end
   end
 end
 
-

data/lib/ducksboard_reporter/version.rb

@@ -1,3 +1,3 @@
 module DucksboardReporter
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ducksboard_reporter.rb

@@ -10,6 +10,7 @@ Hash.include Hashie::Extensions::SymbolizeKeys
 require "ducksboard_reporter/version"
 require "ducksboard_reporter/reporter"
 require "ducksboard_reporter/widget"
+require "ducksboard_reporter/file_tail"
 
 require "ducksboard_reporter/reporters/random"
 require "ducksboard_reporter/reporters/haproxy_log_requests"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ducksboard_reporter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - unnu
@@ -167,6 +167,7 @@ files:
 - ducksboard_reporter.gemspec
 - example_config.yml
 - lib/ducksboard_reporter.rb
+- lib/ducksboard_reporter/file_tail.rb
 - lib/ducksboard_reporter/reporter.rb
 - lib/ducksboard_reporter/reporters/bandwidth.rb
 - lib/ducksboard_reporter/reporters/cpu_usage.rb