ocular 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648cb29cda1d62aec449575ab959c8b76c62e9e0
-  data.tar.gz: 4aa22c197a871dfc6b9f8c7082e36aeb98361d8e
+  metadata.gz: 902d76652adad957cc5559fe95d7876e81fa4359
+  data.tar.gz: c895d66f55f1564956ff5dbe6ad158d1af75dd77
 SHA512:
-  metadata.gz: d8412dd38f44a2858187e00417db2afe1a8f842eb2fef96a3d209fb99df1461270f67b5f693f006088687a83dc8db8a449bfafe8b9dad4f774c157ecc177ca93
-  data.tar.gz: 76b31a5c15a8feedeef0132715b899c0a5c82e98a773e07374eeaf6c5380831cc55906638900b1b1a1bdfb26e2c5d2194fffddf14e769b359bf1bcb7bd37a729
+  metadata.gz: 85917e966df5b3b644d89585d22432a99352b6080133aae5bce6d5f236798c8a25465155182f64f2d25e02040ce06eea4ed62b5fd4089f9c4c8066c4a2c2d7c2
+  data.tar.gz: 75a436317585523e6bed22576fe0e86de251f5d3f849bbbfca0e8609add6b88eb4fea703205bcbf763d9ed39ec9bd0f521c18fc9e297bc882b806bd2a1dc0491

data/lib/ocular/event/eventfactory.rb

@@ -14,7 +14,7 @@ class Ocular
             def initialize(script_name, handlers)
                 @script_name = script_name
                 @events = {}
-                @logger = Ocular::Logging::ConsoleLogger.new
+                @logger = ::Ocular.logger
                 @handlers = handlers
                 @do_fork = true
             end

data/lib/ocular/inputs/cron_input.rb

@@ -31,7 +31,7 @@ class Ocular
                     settings = settings_factory[:http]
 
                     @scheduler = ::Rufus::Scheduler.new
-
+                    ::Ocular.logger.debug "Starting Rufus cron scheduler"
                 end
 
                 def start()
@@ -51,8 +51,9 @@ class Ocular
 
                     def in(rule, &block)
                         eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
+                        ::Ocular.logger.debug "Scheduling cron.in(#{rule}) for block #{block}"
 
-                        id = @handler.scheduler.in(rule) do
+                        id = @handler.scheduler.in(rule, :overlap => false) do
                             context = ::Ocular::DSL::RunContext.new(@logger)
                             context.log_cause("cron.in", {:rule => rule})
                             eventbase.exec(context)
@@ -65,8 +66,9 @@ class Ocular
 
                     def at(rule, &block)
                         eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
+                        ::Ocular.logger.debug "Scheduling cron.at(#{rule}) for block #{block}"
 
-                        id = @handler.scheduler.at(rule) do
+                        id = @handler.scheduler.at(rule, :overlap => false) do
                             context = ::Ocular::DSL::RunContext.new(@logger)
                             context.log_cause("cron.at", {:rule => rule})
                             eventbase.exec(context)
@@ -79,8 +81,10 @@ class Ocular
 
                     def every(rule, &block)
                         eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
+                        ::Ocular.logger.debug "Scheduling cron.every(#{rule}) for block #{block}"
 
-                        id = @handler.scheduler.every(rule) do
+                        id = @handler.scheduler.every(rule, :overlap => false) do
+                            puts "derp!"
                             context = ::Ocular::DSL::RunContext.new(@logger)
                             context.log_cause("cron.every", {:rule => rule})
                             eventbase.exec(context)
@@ -93,8 +97,9 @@ class Ocular
 
                     def cron(rule, &block)
                         eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
+                        ::Ocular.logger.debug "Scheduling cron.cron(#{rule}) for block #{block}"
 
-                        id = @handler.scheduler.cron(rule) do
+                        id = @handler.scheduler.cron(rule, :overlap => false) do
                             context = ::Ocular::DSL::RunContext.new(@logger)
                             context.log_cause("cron.cron", {:rule => rule})
                             eventbase.exec(context)

data/lib/ocular/logging/kafka_logger.rb

@@ -55,7 +55,7 @@ class Ocular
                         message = progname
                     end
                 end
-    
+
                 @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
                 @producer.deliver_messages
             end
@@ -92,7 +92,7 @@ class Ocular
                         "run_id" => progname,
                         "msg" => msg2str(msg),
                         "host" => hostname
-                    } 
+                    }
                     return data.to_json
                 end
 

data/lib/ocular/logging/multilogger.rb

@@ -48,25 +48,28 @@ class Ocular
                 @loggers.each do |logger|
                     logger.add(severity, message, run_id)
                 end
-    
+                true
             end
 
             def log_event(property, value, run_id)
                 @loggers.each do |logger|
                     logger.log_event(property, value, run_id)
                 end
+                true
             end
 
             def log_cause(type, environment, run_id)
                 @loggers.each do |logger|
                     logger.log_cause(type, environment, run_id)
                 end
+                true
             end
 
             def log_timing(key, value, run_id)
                 @loggers.each do |logger|
                     logger.log_timing(key, value, run_id)
                 end
+                true
             end        
         end
     end

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.12"
+    Version = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Juho Mäkinen