ocular 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e4559ff9d5af112b1d8112311d72658732f4a0
-  data.tar.gz: ad7aefaf93159266fdbe1977bed667c24cd82529
+  metadata.gz: 9e7bdc14065534d11c655212e482f3e63f5fe1e3
+  data.tar.gz: 80bee22324973ce182d65d5c7518949e826bc1d1
 SHA512:
-  metadata.gz: 2c89e2f89937f1e1aac4036872e8262db351ef4cfbfb08035e511591756fed79b00ca985ca2886e7cc646ee903850a7624c560c6f1909837af23e0af5113c1e5
-  data.tar.gz: 8fa4c75d13e95ffd823778f7454d2ab4fc390a2e8048360b4c72b3323d6d325252bbd4a3d16bfcbb7f21da1f1e042a9ad1ef3d02836100229404f9f06231feb5
+  metadata.gz: 839537f3335286e0269274211824b3dd8560f4857ec4a04789d43796ef2d71637ea99f74357d7cac72b91051e3eeb1e5f23a14d05332ba837d3da9efaf3f928e
+  data.tar.gz: 55a4b0fdf8c52dcf925740ef367061ceb372c59f677dfc06c1580506f5b18d07310fd2e4ff4d942c813aa1ccb9e162d99ed2676413d63132ece867b832fdf210

data/lib/ocular/dsl/dsl.rb

@@ -18,4 +18,5 @@ require 'ocular/dsl/logging.rb'
 require 'ocular/dsl/ssh.rb'
 require 'ocular/dsl/orbit.rb'
 require 'ocular/dsl/mysql.rb'
+require 'ocular/dsl/rabbitmq.rb'
 

data/lib/ocular/dsl/rabbitmq.rb

@@ -0,0 +1,25 @@
+require 'logger'
+require 'etcd'
+
+class Ocular
+    module DSL
+        module RabbitMQ
+
+            add_help "amqp", "Returns a channel to RabbitMQ broker"
+
+            def amqp()
+                datasources = ::Ocular::Settings::get(:datasources)
+                if !datasources or !datasources[:rabbitmq]
+                    raise "No rabbitmq client settings"
+                end
+                settings = datasources[:rabbitmq] || {}
+                conn = Bunny.new(settings[:url] || nil)
+                conn.start
+
+                return conn.create_channel
+            end
+
+        end
+
+    end
+end

data/lib/ocular/dsl/runcontext.rb

@@ -16,6 +16,7 @@ class Ocular
             include Ocular::DSL::Etcd
             include Ocular::DSL::Orbit
             include Ocular::DSL::MySQL
+            include Ocular::DSL::RabbitMQ
 
             include Ocular::Inputs::Cron::DSL
 

data/lib/ocular/event/eventbase.rb

@@ -12,7 +12,7 @@ class Ocular
                 attr_accessor :error
             end
 
-            attr_accessor :proxy
+            attr_accessor :proxy, :last_run
 
             def initialize(proxy, &block)
                 @callback = block
@@ -30,6 +30,7 @@ class Ocular
                     end
                 ensure
                     context.log_timing("execution_time", start)
+                    @last_run = context
                 end
             end
 
@@ -41,14 +42,12 @@ class Ocular
 
                     begin
                         r.response = __call(context, @callback)
-                        #r.response = context.instance_eval(&@callback)
                     rescue Exception => error
                         r.error = error
                     end
 
                     Marshal.dump(r, writer)
                     writer.close
-
                 end
                 writer.close
 
@@ -57,7 +56,6 @@ class Ocular
                 reader.close
                 Process.wait(child_pid)
 
-
                 if r.error
                     raise r.error
                 end
@@ -66,7 +64,6 @@ class Ocular
 
             def exec_nofork(context)
                 return __call(context, @callback)
-                #context.instance_eval(&@callback)
             end
 
             def __call(context, callback)

data/lib/ocular/event/eventfactory.rb

@@ -26,6 +26,7 @@ class Ocular
             include Ocular::DSL::Fog
             include Ocular::DSL::Etcd
             include Ocular::DSL::MySQL
+            include Ocular::DSL::RabbitMQ
 
             include Ocular::Inputs::HTTP::DSL
             include Ocular::Inputs::HTTP::ErrorDSL

data/lib/ocular/inputs/cron_input.rb

@@ -26,12 +26,27 @@ class Ocular
 
                 attr_reader :routes
                 attr_reader :scheduler
+                attr_reader :cron_enabled
 
                 def initialize(settings_factory)
-                    settings = settings_factory[:http]
+                    settings = settings_factory[:cron]
+                    @cron_enabled = true
+
+                    if settings[:lock]
+                        @cron_enabled = false
+                    end
 
                     @scheduler = ::Rufus::Scheduler.new
                     ::Ocular.logger.debug "Starting Rufus cron scheduler"
+
+                    if settings[:lock]
+                        @scheduler.every(settings[:lock_delay] || "10s", :overlap => false) do
+                            etcd = ::Ocular::DSL::Etcd.etcd()
+
+                            ret = etcd.get(settings[:lock])
+                            pp ret
+                        end
+                    end
                 end
 
                 def start()
@@ -42,6 +57,15 @@ class Ocular
                     @scheduler.shutdown
                 end
 
+                def disable()
+                    @cron_enabled = false
+                end 
+
+                def enable()
+                    @cron_enabled = true
+                end
+
+
                 class DSLProxy
                     def initialize(proxy, handler, logger)
                         @proxy = proxy
@@ -54,9 +78,11 @@ class Ocular
                         ::Ocular.logger.debug "Scheduling cron.in(#{rule}) for block #{block}"
 
                         id = @handler.scheduler.in(rule, :overlap => false) do
-                            context = ::Ocular::DSL::RunContext.new(@logger)
-                            context.log_cause("cron.in", {:rule => rule})
-                            eventbase.exec(context)
+                            if @handler.cron_enabled
+                                context = ::Ocular::DSL::RunContext.new(@logger)
+                                context.log_cause("cron.in", {:rule => rule})
+                                eventbase.exec(context)
+                            end
                         end
 
                         @proxy.events[id] = eventbase
@@ -69,9 +95,11 @@ class Ocular
                         ::Ocular.logger.debug "Scheduling cron.at(#{rule}) for block #{block}"
 
                         id = @handler.scheduler.at(rule, :overlap => false) do
-                            context = ::Ocular::DSL::RunContext.new(@logger)
-                            context.log_cause("cron.at", {:rule => rule})
-                            eventbase.exec(context)
+                            if @handler.cron_enabled
+                                context = ::Ocular::DSL::RunContext.new(@logger)
+                                context.log_cause("cron.at", {:rule => rule})
+                                eventbase.exec(context)
+                            end
                         end
 
                         @proxy.events[id] = eventbase
@@ -84,9 +112,11 @@ class Ocular
                         ::Ocular.logger.debug "Scheduling cron.every(#{rule}) for block #{block}"
 
                         id = @handler.scheduler.every(rule, :overlap => false) do
-                            context = ::Ocular::DSL::RunContext.new(@logger)
-                            context.log_cause("cron.every", {:rule => rule})
-                            eventbase.exec(context)
+                            if @handler.cron_enabled
+                                context = ::Ocular::DSL::RunContext.new(@logger)
+                                context.log_cause("cron.every", {:rule => rule})
+                                eventbase.exec(context)
+                            end
                         end
 
                         @proxy.events[id] = eventbase
@@ -99,9 +129,11 @@ class Ocular
                         ::Ocular.logger.debug "Scheduling cron.cron(#{rule}) for block #{block}"
 
                         id = @handler.scheduler.cron(rule, :overlap => false) do
-                            context = ::Ocular::DSL::RunContext.new(@logger)
-                            context.log_cause("cron.cron", {:rule => rule})
-                            eventbase.exec(context)
+                            if @handler.cron_enabled
+                                context = ::Ocular::DSL::RunContext.new(@logger)
+                                context.log_cause("cron.cron", {:rule => rule})
+                                eventbase.exec(context)
+                            end
                         end
 
                         @proxy.events[id] = eventbase

data/lib/ocular/inputs/http_input.rb

@@ -595,6 +595,16 @@ class Ocular
                         @stopsignal.pop
                         server.stop(true)
                     end
+
+                    define_check_route()
+                end
+
+                def define_check_route
+                    pattern, keys = compile("/check")
+
+                    (@routes["GET"] ||= []) << build_signature(pattern, keys) do |context|
+                        [200, "OK"]
+                    end
                 end
 
                 def stop()

data/lib/ocular/inputs/rabbitmq_input.rb

@@ -2,7 +2,7 @@
 require 'ocular/inputs/base.rb'
 require 'ocular/dsl/dsl.rb'
 require 'ocular/dsl/runcontext.rb'
-require 'rufus/scheduler'
+require 'bunny'
 
 class Ocular
     module Inputs
@@ -23,19 +23,15 @@ class Ocular
 
                 attr_reader :routes
                 attr_reader :conn
+                attr_reader :settings
 
                 def initialize(settings_factory)
-                    settings = settings_factory[:rabbitmq]
+                    @settings = settings_factory[:rabbitmq]
 
                     ::Ocular.logger.debug "Starting RabbitMQ input"
 
                     @conn = Bunny.new
-                    conn.start
-
-                    ch = conn.create_channel
-                    q  = ch.queue("bunny.examples.hello_world", :auto_delete => true)
-                    x  = ch.default_exchange
-
+                    @conn.start
                 end
 
                 def start()
@@ -43,14 +39,14 @@ class Ocular
                 end
 
                 def stop()
-                    @scheduler.shutdown
+                    @conn.close
                 end
 
                 class RabbitMQRunContext < ::Ocular::DSL::RunContext
                     attr_accessor :delivery_info, :metadata, :payload
 
-                    def initialize()
-                        super(Ocular::Logging::ConsoleLogger.new)
+                    def initialize(logger)
+                        super(logger)
                     end
                 end
 
@@ -62,23 +58,30 @@ class Ocular
                         @logger = logger
                     end
 
-                    def subscribe(topic, &block)
+                    def subscribe(queue, *settings, &block)
                         eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
-                        ::Ocular.logger.debug "rabbitmq.subscribe to# #{topic} for block #{block}"
+                        ::Ocular.logger.debug "rabbitmq.subscribe to# #{queue} for block #{block}"
+
+                        ch = @handler.conn.create_channel
+                        q  = ch.queue(queue, *settings)
 
-                        q.subscribe(topic) do |delivery_info, metadata, payload|
+                        q.subscribe(:manual_ack => true) do |delivery_info, metadata, payload|
                             context = RabbitMQRunContext.new(@logger)
-                            context.log_cause("rabbitmq.subscribe(#{topic})")
+                            context.log_cause("rabbitmq.subscribe(#{queue})", {:delivery_info => delivery_info, :metadata => metadata, :payload => payload})
                             context.delivery_info = delivery_info
                             context.metadata = metadata
                             context.payload = payload
                             eventbase.exec(context)
+                            ch.acknowledge(delivery_info.delivery_tag, false)
                         end
 
+                        id = queue + "-" + block.to_s
+
                         @proxy.events[id] = eventbase
 
                         return id
                     end
+
                 end
 
             end

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.15"
+    Version = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -204,6 +204,7 @@ files:
 - lib/ocular/dsl/logging.rb
 - lib/ocular/dsl/mysql.rb
 - lib/ocular/dsl/orbit.rb
+- lib/ocular/dsl/rabbitmq.rb
 - lib/ocular/dsl/runcontext.rb
 - lib/ocular/dsl/ssh.rb
 - lib/ocular/event/eventbase.rb