ocular 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7bdc14065534d11c655212e482f3e63f5fe1e3
-  data.tar.gz: 80bee22324973ce182d65d5c7518949e826bc1d1
+  metadata.gz: f2b13556c63053b9d7f15e8382b3803295edc3d4
+  data.tar.gz: 8862213d31cabfaee4332bcb33bcacf63601e5d7
 SHA512:
-  metadata.gz: 839537f3335286e0269274211824b3dd8560f4857ec4a04789d43796ef2d71637ea99f74357d7cac72b91051e3eeb1e5f23a14d05332ba837d3da9efaf3f928e
-  data.tar.gz: 55a4b0fdf8c52dcf925740ef367061ceb372c59f677dfc06c1580506f5b18d07310fd2e4ff4d942c813aa1ccb9e162d99ed2676413d63132ece867b832fdf210
+  metadata.gz: 1be07d88abd000eb2cb6c70b92b9790b33720d8d72554393f8e0f0bc21ac07a43abc8c511b7f807ed98c40a728f46bbc7613a7d0fd73e9994104a59a0089d91d
+  data.tar.gz: bb7edaf144bac5bc7433505b6c05b23e9027f27656c8bbd32a257fff9a319cafc3395947e499831ebdba9a8236b3f1b21ff7bd7a5c020527ad30b14433201c4d

data/README.md

@@ -5,11 +5,26 @@ Ocular allows to easily create small scripts which are triggered from multiple d
 
 The goal is that a new script could be written really quickly to automate a previously manual infrastructure maintenance job instead of doing the manual job yet another time. Scripts are written in Ruby with a simple Ocular DSL which allows the script to easily respond to multitude different events.
 
-Planned event sources:
+Currently implemented event sources:
  - HTTP calls
  - RabbitMQ messages
+ - Timers
+
+Planned event sources:
  - SQS/SNS messages
- - Graphite item triggers
  - Zabbix alerts
- - Timers
+ - NATS broadcast messages
+ - salt-stack event bus
+ 
+Currently implemented clients to external services (ie. what you can easily do once your event has been triggered):
+ - MySQL
+ - etcd
+ - RabbitMQ
+ - AWS/EC2
+ - Kafka (for logging)
+ - SSH for remote execution
  
+Planned clients to external services:
+ - Graphite
+ - Zabbix configuration
+ - salt-stack remote state execution

data/lib/ocular/daemon.rb

@@ -37,7 +37,6 @@ class Ocular
         end
 
         def start_input_handlers()
-            puts "derp"
             @eventfactory.start_input_handlers()
         end
 

data/lib/ocular/dsl/etcd.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'etcd'
+require 'pp'
 
 class Ocular
     module DSL
@@ -29,6 +30,67 @@ class Ocular
                 return @@__etcd_instance
             end
 
+            def ttl_lock(key, ttl:10)
+                id = @run_id
+                if !id
+                    id = Process.pid.to_s
+                    Socket.ip_address_list.each do |addr|
+                        next if addr.ip_address == "127.0.0.1"
+                        next if addr.ip_address.start_with?("::1")
+                        next if addr.ip_address.start_with?("fe80::1")
+                        id += "-" + addr.ip_address
+                    end
+                end
+
+                client = etcd()
+
+                current_lock = locked?(key)
+
+                if current_lock != id and current_lock != nil
+                    return nil # Somebody else has lock, can't lock by ourself
+                end
+
+                if current_lock == id and current_lock != nil
+                    begin
+                        client.test_and_set("/ocular/locks/#{key}", value: id, prevValue: id, ttl: ttl)
+                        return id
+                    rescue ::Etcd::NodeExist => e
+                        return nil
+                    end
+
+                else
+                    begin
+                        client.create("/ocular/locks/#{key}", value: id, ttl: ttl)
+                        return id
+                    rescue ::Etcd::NodeExist => e
+                        return nil
+                    end
+                end
+            end
+
+            def unlock(key)
+                client = etcd()
+                begin
+                    client.delete("/ocular/locks/#{key}")
+                rescue ::Etcd::KeyNotFound
+
+                end
+                return true
+            end
+
+            def locked?(key)
+                client = etcd()
+                begin
+                    ret = client.get("/ocular/locks/#{key}")
+                    if ret.node and ret.node.expiration == nil
+                        warn("Key #{key} has been locked permanently with value '#{ret.node.value}'!")
+                    end
+                    return ret.node.value # Key is locked
+                rescue ::Etcd::KeyNotFound => e
+                    return nil
+                end
+            end
+
         end
 
     end

data/lib/ocular/event/eventbase.rb

@@ -46,7 +46,13 @@ class Ocular
                         r.error = error
                     end
 
-                    Marshal.dump(r, writer)
+                    begin
+                        Marshal.dump(r, writer)
+                    rescue TypeError => e
+                        ::Ocular.logger.error "TypeError when trying to marshal event handler return value. Reason: #{e}"
+                        ::Ocular.logger.error "This is usually because you forgot that the last function return value is returned from the handler function. The current type of the returned value is #{r.response.class}. Please make sure your handler returns a proper value which doesn't reference any sockets or otherwise complex unserializable objects."
+                        ::Ocular.logger.error "The value of the returned value is :#{r.response.pretty_inspect}"
+                    end
                     writer.close
                 end
                 writer.close

data/lib/ocular/inputs/cron_input.rb

@@ -29,22 +29,28 @@ class Ocular
                 attr_reader :cron_enabled
 
                 def initialize(settings_factory)
-                    settings = settings_factory[:cron]
+                    settings = settings_factory.fetch(:cron, {})
                     @cron_enabled = true
 
+                    pp settings
                     if settings[:lock]
                         @cron_enabled = false
                     end
 
+                    if settings[:enabled] == false
+                        ::Ocular.logger.info "Cron is disabled from settings"
+                        @cron_enabled = false
+                    end
+
                     @scheduler = ::Rufus::Scheduler.new
                     ::Ocular.logger.debug "Starting Rufus cron scheduler"
 
-                    if settings[:lock]
+                    if settings[:lock] and @cron_enabled == true
+                        Ocular.logger.debug "Enabling cron locking at pid #{Process.pid.to_s}"
                         @scheduler.every(settings[:lock_delay] || "10s", :overlap => false) do
-                            etcd = ::Ocular::DSL::Etcd.etcd()
+                            c = Class.new.extend(Ocular::DSL::Etcd)
 
-                            ret = etcd.get(settings[:lock])
-                            pp ret
+                            @cron_enabled = c.ttl_lock("cron_input", ttl:20)
                         end
                     end
                 end
@@ -59,7 +65,7 @@ class Ocular
 
                 def disable()
                     @cron_enabled = false
-                end 
+                end
 
                 def enable()
                     @cron_enabled = true

data/lib/ocular/inputs/http_input.rb

@@ -445,7 +445,9 @@ class Ocular
                     context.params = indifferent_params(context.request.params)
 
                     context.response['Content-Type'] = nil
-                    invoke(context) { |context| dispatch(context) }
+                    invoke(context) do |context|
+                        dispatch(context)
+                    end
 
                     unless context.response['Content-Type']
                         context.response['Content-Type'] = "text/html"
@@ -469,7 +471,6 @@ class Ocular
 
                 def invoke(context)
                     res = catch(:halt) { yield(context) }
-
                     if Array === res and Fixnum === res.first
                         res = res.dup
                         status(context, res.shift)
@@ -488,7 +489,11 @@ class Ocular
                         context.response.status = error.http_status
 
                         if error.respond_to? :to_s
-                            puts error.to_s
+                            str = error.to_s
+                            if !str.end_with?("\n")
+                                str += "\n"
+                            end
+                            context.response.body = str
                         end
                     else
                         context.response.status = 500
@@ -603,7 +608,7 @@ class Ocular
                     pattern, keys = compile("/check")
 
                     (@routes["GET"] ||= []) << build_signature(pattern, keys) do |context|
-                        [200, "OK"]
+                        [200, "OK\n"]
                     end
                 end
 

data/lib/ocular/inputs/rabbitmq_input.rb

@@ -71,8 +71,14 @@ class Ocular
                             context.delivery_info = delivery_info
                             context.metadata = metadata
                             context.payload = payload
-                            eventbase.exec(context)
-                            ch.acknowledge(delivery_info.delivery_tag, false)
+                            begin
+                                eventbase.exec(context)
+                                ch.acknowledge(delivery_info.delivery_tag, false)
+                            rescue 
+                                sleep 1
+                                warn "Error on RabbitMQ event processing on context #{context}"
+                                ch.reject(delivery_info.delivery_tag, true)
+                            end
                         end
 
                         id = queue + "-" + block.to_s

data/lib/ocular/settings.rb

@@ -28,7 +28,7 @@ class Ocular
         end
 
         def self.load_from_file(filename)
-            #puts "Loaded settings from #{filename}"
+            ::Ocular.logger.debug "Loaded settings from #{filename}"
             @settings = ::Ocular::deep_symbolize(YAML::load_file(filename))
         end
 

data/lib/ocular/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye