rforward 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 016780641d038b2fa6a0436892a3e0b2a30cc222
-  data.tar.gz: 7c5be24819f08f32779865199e4297d84836d0ae
+  metadata.gz: b604a36bc1961d87954e6cd92266934969ace196
+  data.tar.gz: da76ae995aaf1f648da48ec8c03b1db8a26f5274
 SHA512:
-  metadata.gz: 32b5cdacc9972bba536623629393cc2092f945de7678312adc6c6a5ea76f60980d31056ddf374279c00e4dc01f7051f1f965ed4fe6e2a6350e70c5f5196a59a1
-  data.tar.gz: e55202665463993ec8128255a18901943da34f5a4277916de8b37b2afbe3885127e14e351906dff9cf64e6a70f280a9266035f6a688d6cda0224d2febfcb32df
+  metadata.gz: 20a8dd075a2b6fb29e9ed00dd8a648b05debe226c641096a7c1f8221357571d1ea42872aef2866bc947a80f1efe9f693bc8a68b2ef871a3a5cbee5707670051a
+  data.tar.gz: 93b501de72c5e6cc2df5e63fd9dc7999cfa34b5f429ce469da7abfec3fae5d192f3d2616abb6c4ac57c9963899e95832c181f16c1364d2dd05d07882eceb0cdd

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+rforward.yml
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rforward (0.1.0)
+    rforward (0.1.1)
       dry-container
       fluent-logger
       thor (~> 0.20)

data/exe/rforward

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 require "rforward"
-ENV['ROOT_PATH'] = File.expand_path("../", __FILE__)
+ENV['ROOT_PATH'] = Dir.getwd 
 Rforward::CLI.start(ARGV)

data/lib/rforward/config.rb

@@ -7,11 +7,11 @@ class Config
   FLUENTD = :flunetd.freeze
 
   def load_config config_path
-    config = YAML.load_file config_path
+    @config = YAML.load_file config_path
   end
 
   def [](key)
-    config = config || sample
+    config = @config || sample
     config[key.to_s]
   end
 
@@ -27,9 +27,9 @@ class Config
 
   def sample
     hash = {
-      fluentd_host: 'localhost',
-      fluentd_port: '24224',
-      tag: 'event'
+      'fluentd_host' => 'localhost',
+      'fluentd_port' => '24224',
+      'tag' => 'event'
     }
   end
 end

data/lib/rforward/directory_processor.rb

@@ -8,7 +8,9 @@ class DirectoryProcessor
   end
 
   def call
-    Dir["#{path}/**#{ext}"].each do |filepath|
+    files_arr = Dir["#{path}/**#{ext}"]
+    Stat.instance.files_total = files_arr.count
+    files_arr.each do |filepath|
       FileProcessor.call filepath
     end
   end

data/lib/rforward/exceptions.rb

@@ -3,13 +3,13 @@ end
 
 class WrongPathEx < BaseRforwardEx
   def initialize path
-    super("[ERROR] (#{path}) path must be exist and must be a directory ")
+    super("(#{path}) path must be exist and must be a directory ")
   end
 end
 
 class ConfigNotFoundEx < BaseRforwardEx
   def initialize config
-    super("[ERROR] (#{config}) config yml not found create config first 'rforward create config")
+    super("(#{config}) config yml not found create config first 'rforward create config'")
   end
 end
 

data/lib/rforward/ffluentd_line.rb

@@ -8,10 +8,13 @@ class FFluentdLine
   end
 
   def call line
+    Stat.instance.total += 1
     json = JSON.parse line
     @client.post Config.instance[:tag], json
+    Stat.instance.success += 1
     true
   rescue Exception => e
+    Stat.instance.failed += 1
     RLogger.instance.error "(#{e.message}) (line: #{line})"
     false
   end

data/lib/rforward/file_processor.rb

@@ -6,9 +6,13 @@ class FileProcessor
   end
 
   def call
+    RLogger.instance.info "start working on #{filepath}"
     File.readlines(filepath).each do |line|
       line_processor.call line
     end
+    Stat.instance.files_current += 1
+    RLogger.instance.info "finish working on #{filepath}"
+    RLogger.instance.stat
   end
 
   def self.call filepath

data/lib/rforward/rlogger.rb

@@ -8,4 +8,8 @@ class RLogger
   def error msg
     puts "[ERROR] #{msg}"
   end
+
+  def stat
+    puts Stat.instance
+  end
 end

data/lib/rforward/stat.rb

@@ -0,0 +1,17 @@
+class Stat
+  include Singleton
+  attr_accessor :success, :failed, :total, :files_total, :files_current
+
+  def initialize
+    @success, @failed, @total, @files_total, @files_current = 0, 0, 0, 0, 0
+  end
+
+  def to_s
+    text = []
+    text << "[STAT]"
+    text << "[total: #{total}] [success: #{success}] [failed #{failed}]"
+    text << "[file current #{files_current}] [files total #{files_total}]"
+    text << "[STAT]"
+    text.join "\n"
+  end
+end

data/lib/rforward/version.rb

@@ -1,3 +1,3 @@
 module Rforward
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/rforward.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'json'
 require 'dry-container'
 require "rforward/exceptions"
+require "rforward/stat"
 require "rforward/rlogger"
 require "rforward/directory_processor"
 require "rforward/file_processor"
@@ -17,6 +18,7 @@ module Rforward
     def process_logs path, ext=".log"
       check_config
       dependencies
+      DirectoryProcessor.call path, ext
       RLogger.instance.info "#{path} logs extensions #{ext}"
     rescue ConfigNotFoundEx => e
       RLogger.instance.error e.message
@@ -31,7 +33,7 @@ module Rforward
 
     private
     def check_config
-      raise ConfigNotFoundEx, path unless config_path.file? && config_path.exist?
+      raise ConfigNotFoundEx, config_path.to_path unless config_path.file? && config_path.exist?
       Config.instance.load_config config_path
     end
 
@@ -41,7 +43,7 @@ module Rforward
 
     def dependencies
       Config.register Config::FLUENTD do
-        host, port, tag = Config.instance[:host], Config.instance[:port], Config.instance[:tag]
+        host, port, tag = Config.instance[:fluentd_host], Config.instance[:fluentd_port], Config.instance[:tag]
         Fluent::Logger::FluentLogger.new(nil, host: host, port: port.to_i)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rforward
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gingray
@@ -113,7 +113,6 @@ email:
 - gingray.dev@gmail.com
 executables:
 - rforward
-- rforward.yml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -129,7 +128,6 @@ files:
 - bin/console
 - bin/setup
 - exe/rforward
-- exe/rforward.yml
 - lib/rforward.rb
 - lib/rforward/config.rb
 - lib/rforward/directory_processor.rb
@@ -137,6 +135,7 @@ files:
 - lib/rforward/ffluentd_line.rb
 - lib/rforward/file_processor.rb
 - lib/rforward/rlogger.rb
+- lib/rforward/stat.rb
 - lib/rforward/version.rb
 - rforward.gemspec
 homepage: https://github.com/gingray/rforward

data/exe/rforward.yml

@@ -1,4 +0,0 @@
----
-:fluentd_host: localhost
-:fluentd_port: '24224'
-:tag: event