ocular 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d45b8d9465be93f0f27f5819c758ebac6452a39
-  data.tar.gz: 65ad1e3578826f806d62da568436412fe57b9fd9
+  metadata.gz: f6b417bff05762b7e15a5dcc2dad418b5e31b224
+  data.tar.gz: fc7391ab1ac121832c29627712830a1447bca5e8
 SHA512:
-  metadata.gz: 121bd72c23beabb03efa9c31515677bcc26a1f865b27eb689f4f7d4f1b0d9a8de9f5a6aae2885b5d99468a174a4d51e0b43b1bf2be1a8c5945d1cc74da526216
-  data.tar.gz: b944c036054b6c237fc6a3a8e76ae31acb2090f5cf1a64b99b301dbc8411405ed706c23cbe03a2716a787328188142f68cc3b21a36487afd1abe29f8f3b604fd
+  metadata.gz: 7b2d2092d6d8391456907c4323cd636bc73746840865c91fbbf5caff9ef6c12f04f1674993065d7fd0a1490e7f64d2a37812b6e71e230b352df4749c56881b78
+  data.tar.gz: 26d6329a5b56c07807e8125f6c3a9874c76721d71bd04d1bd64e5408a75262a87e75be2824c34ab06a76b39a904458b04538c57742fcc769e2cf8b14e88be84a

data/bin/ocular

@@ -4,7 +4,7 @@ require 'ocular'
 require 'optparse'
 require 'ostruct'
 require 'pp'
-
+require 'logger'
 
 class OptparseExample
 

data/lib/ocular/inputs/http_input.rb

@@ -590,7 +590,7 @@ class Ocular
 
                     @thread = Thread.new do
                         events_hander = @settings[:silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
-                        server   = ::Puma::Server.new(self, events_hander)
+                        server = ::Puma::Server.new(self, events_hander)
 
                         server.add_tcp_listener @settings[:host], @settings[:port]
                         server.min_threads = 0

data/lib/ocular/logging/kafka_logger.rb

@@ -1,5 +1,7 @@
 require "kafka"
 require "socket"
+require "logger"
+require "thread"
 
 class Ocular
     module Logging
@@ -14,16 +16,22 @@ class Ocular
                 if kafka != nil
                     @kafka = kafka
                 else
-                    pp settings
+                    #logger = Logger.new(STDOUT)
+                    #logger.level = Logger::DEBUG
+                    #settings[:client][:logger] = logger
                     @kafka = Kafka.new(settings[:client])
                 end
                 @settings = settings
 
                 @producer = @kafka.producer
+
+                @semaphore = Mutex.new
             end
 
             def reconnect()
                 @kafka = Kafka.new(@settings[:client])
+                @producer = @kafka.producer
+                @semaphore = Mutex.new
             end
 
             def debug(message = nil, &block)
@@ -47,6 +55,10 @@ class Ocular
                 add(Severity::FATAL, message, @run_id, &block)
             end
 
+            def deliver_messages
+                @producer.deliver_messages
+            end
+
             def add(severity, message = nil, run_id = nil, &block)
                 severity ||= Severity::UNKNOWN
                 if severity < @level
@@ -62,8 +74,10 @@ class Ocular
                 end
 
                 begin
-                    @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
-                    @producer.deliver_messages
+                    @semaphore.synchronize do
+                        @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
+                        deliver_messages()
+                    end
                 rescue StandardError => e
                     STDERR.puts "Error on producing kafka message: #{e}"
                     STDERR.puts "Message was #{message}, stacktrace: #{e.backtrace.join("\n")}"
@@ -72,8 +86,10 @@ class Ocular
 
             def log_event(property, value, run_id = nil)
                 begin
-                    @producer.produce(@formatter.format_event(property, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                    @producer.deliver_messages
+                    @semaphore.synchronize do
+                        @producer.produce(@formatter.format_event(property, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                        deliver_messages()
+                    end
                 rescue StandardError => e
                     STDERR.puts "Error on producing kafka log_event: #{e}"
                     STDERR.puts "#{property} => #{value}, stacktrace: #{e.backtrace.join("\n")}"                    
@@ -82,8 +98,10 @@ class Ocular
 
             def log_cause(type, environment, run_id = nil)
                 begin
-                    @producer.produce(@formatter.format_cause(type, environment, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                    @producer.deliver_messages
+                    @semaphore.synchronize do
+                        @producer.produce(@formatter.format_cause(type, environment, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                        deliver_messages()
+                    end
                 rescue StandardError => e
                     STDERR.puts "Error on producing kafka log_cause: #{e}"
                     STDERR.puts "type: #{type}, stacktrace: #{e.backtrace.join("\n")}"                    
@@ -93,8 +111,10 @@ class Ocular
 
             def log_timing(key, value, run_id = nil)
                 begin
-                    @producer.produce(@formatter.format_event("timing:" + key, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                    @producer.deliver_messages
+                    @semaphore.synchronize do
+                        @producer.produce(@formatter.format_event("timing:" + key, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                        deliver_messages()
+                    end
                 rescue StandardError => e
                     STDERR.puts "Error on producing kafka log_timing: #{e}"
                     STDERR.puts "Timing: #{key} => #{value}, stacktrace: #{e.backtrace.join("\n")}"

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.2.5"
+    Version = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement