ocular 0.1.12 → 0.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ocular/event/eventfactory.rb +1 -1
  3. data/lib/ocular/inputs/cron_input.rb +10 -5
  4. data/lib/ocular/logging/kafka_logger.rb +2 -2
  5. data/lib/ocular/logging/multilogger.rb +4 -1
  6. data/lib/ocular/version.rb +1 -1
  7. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 648cb29cda1d62aec449575ab959c8b76c62e9e0
4
- data.tar.gz: 4aa22c197a871dfc6b9f8c7082e36aeb98361d8e
3
+ metadata.gz: 902d76652adad957cc5559fe95d7876e81fa4359
4
+ data.tar.gz: c895d66f55f1564956ff5dbe6ad158d1af75dd77
5
5
  SHA512:
6
- metadata.gz: d8412dd38f44a2858187e00417db2afe1a8f842eb2fef96a3d209fb99df1461270f67b5f693f006088687a83dc8db8a449bfafe8b9dad4f774c157ecc177ca93
7
- data.tar.gz: 76b31a5c15a8feedeef0132715b899c0a5c82e98a773e07374eeaf6c5380831cc55906638900b1b1a1bdfb26e2c5d2194fffddf14e769b359bf1bcb7bd37a729
6
+ metadata.gz: 85917e966df5b3b644d89585d22432a99352b6080133aae5bce6d5f236798c8a25465155182f64f2d25e02040ce06eea4ed62b5fd4089f9c4c8066c4a2c2d7c2
7
+ data.tar.gz: 75a436317585523e6bed22576fe0e86de251f5d3f849bbbfca0e8609add6b88eb4fea703205bcbf763d9ed39ec9bd0f521c18fc9e297bc882b806bd2a1dc0491
data/lib/ocular/event/eventfactory.rb CHANGED
@@ -14,7 +14,7 @@ class Ocular
14
14
  def initialize(script_name, handlers)
15
15
  @script_name = script_name
16
16
  @events = {}
17
- @logger = Ocular::Logging::ConsoleLogger.new
17
+ @logger = ::Ocular.logger
18
18
  @handlers = handlers
19
19
  @do_fork = true
20
20
  end
data/lib/ocular/inputs/cron_input.rb CHANGED
@@ -31,7 +31,7 @@ class Ocular
31
31
  settings = settings_factory[:http]
32
32
 
33
33
  @scheduler = ::Rufus::Scheduler.new
34
-
34
+ ::Ocular.logger.debug "Starting Rufus cron scheduler"
35
35
  end
36
36
 
37
37
  def start()
@@ -51,8 +51,9 @@ class Ocular
51
51
 
52
52
  def in(rule, &block)
53
53
  eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
54
+ ::Ocular.logger.debug "Scheduling cron.in(#{rule}) for block #{block}"
54
55
 
55
- id = @handler.scheduler.in(rule) do
56
+ id = @handler.scheduler.in(rule, :overlap => false) do
56
57
  context = ::Ocular::DSL::RunContext.new(@logger)
57
58
  context.log_cause("cron.in", {:rule => rule})
58
59
  eventbase.exec(context)
@@ -65,8 +66,9 @@ class Ocular
65
66
 
66
67
  def at(rule, &block)
67
68
  eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
69
+ ::Ocular.logger.debug "Scheduling cron.at(#{rule}) for block #{block}"
68
70
 
69
- id = @handler.scheduler.at(rule) do
71
+ id = @handler.scheduler.at(rule, :overlap => false) do
70
72
  context = ::Ocular::DSL::RunContext.new(@logger)
71
73
  context.log_cause("cron.at", {:rule => rule})
72
74
  eventbase.exec(context)
@@ -79,8 +81,10 @@ class Ocular
79
81
 
80
82
  def every(rule, &block)
81
83
  eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
84
+ ::Ocular.logger.debug "Scheduling cron.every(#{rule}) for block #{block}"
82
85
 
83
- id = @handler.scheduler.every(rule) do
86
+ id = @handler.scheduler.every(rule, :overlap => false) do
87
+ puts "derp!"
84
88
  context = ::Ocular::DSL::RunContext.new(@logger)
85
89
  context.log_cause("cron.every", {:rule => rule})
86
90
  eventbase.exec(context)
@@ -93,8 +97,9 @@ class Ocular
93
97
 
94
98
  def cron(rule, &block)
95
99
  eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
100
+ ::Ocular.logger.debug "Scheduling cron.cron(#{rule}) for block #{block}"
96
101
 
97
- id = @handler.scheduler.cron(rule) do
102
+ id = @handler.scheduler.cron(rule, :overlap => false) do
98
103
  context = ::Ocular::DSL::RunContext.new(@logger)
99
104
  context.log_cause("cron.cron", {:rule => rule})
100
105
  eventbase.exec(context)
data/lib/ocular/logging/kafka_logger.rb CHANGED
@@ -55,7 +55,7 @@ class Ocular
55
55
  message = progname
56
56
  end
57
57
  end
58
-
58
+
59
59
  @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
60
60
  @producer.deliver_messages
61
61
  end
@@ -92,7 +92,7 @@ class Ocular
92
92
  "run_id" => progname,
93
93
  "msg" => msg2str(msg),
94
94
  "host" => hostname
95
- }
95
+ }
96
96
  return data.to_json
97
97
  end
98
98
 
data/lib/ocular/logging/multilogger.rb CHANGED
@@ -48,25 +48,28 @@ class Ocular
48
48
  @loggers.each do |logger|
49
49
  logger.add(severity, message, run_id)
50
50
  end
51
-
51
+ true
52
52
  end
53
53
 
54
54
  def log_event(property, value, run_id)
55
55
  @loggers.each do |logger|
56
56
  logger.log_event(property, value, run_id)
57
57
  end
58
+ true
58
59
  end
59
60
 
60
61
  def log_cause(type, environment, run_id)
61
62
  @loggers.each do |logger|
62
63
  logger.log_cause(type, environment, run_id)
63
64
  end
65
+ true
64
66
  end
65
67
 
66
68
  def log_timing(key, value, run_id)
67
69
  @loggers.each do |logger|
68
70
  logger.log_timing(key, value, run_id)
69
71
  end
72
+ true
70
73
  end
71
74
  end
72
75
  end
data/lib/ocular/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Ocular
2
- Version = "0.1.12"
2
+ Version = "0.1.13"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ocular
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.12
4
+ version: 0.1.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juho Mäkinen