slnky 0.12.4 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cfe54e170e8248c911458a77b5d73c0c2c3640e
-  data.tar.gz: 285c09739886dc2383e5109e5d403a62e5261646
+  metadata.gz: b3c1ed8013e3e37e78007da5f7ea94fb8a184e38
+  data.tar.gz: 116c7139be8b7476587bd148cddf676960f1c71d
 SHA512:
-  metadata.gz: b8188e6017231bd395507e9fc6583277001bccf1bda16c78fe6e5a8600f2bb2deb804ae7b30c5158e66f706bf82e6ce8f351958e7ffdac3267b17dc925a0b54c
-  data.tar.gz: 614be9e8493f7b11dfa4f9e66d2bf30d7caa0357dfb9ffa50c26eaa518739cbc5991674b3c4d246779c2a0966bbd2ef35cf7588a5cea90832c960cd498c7f19b
+  metadata.gz: 5566ee1d01a4abec62e40070e9597241623a37308a3970a865af544d13e5e00a5be37167989f2a214963640427055824c6a43f9d42a2ad8a3cc7ff9a33804b31
+  data.tar.gz: eda9b8ba0146900f2463c34aed0e05ba3279047fdf7085b57e39b1a49450dee4530d4b6685d1f9a65d403045e9b10361b78742f8727f95a7c223901484297107

data/lib/slnky.rb

@@ -9,6 +9,7 @@ require 'slnky/config'
 require 'slnky/log'
 require 'slnky/system'
 require 'slnky/message'
+require 'slnky/brain'
 require 'slnky/transport'
 require 'slnky/service'
 require 'slnky/client'
@@ -21,8 +22,9 @@ module Slnky
     end
 
     def heartbeat(name)
-      server = ENV['SLNKY_URL'] || Slnky.config.url
-      RestClient.post "#{server}/hooks/heartbeat", {name: name}, content_type: :json, accept: :json
+      # server = ENV['SLNKY_URL'] || Slnky.config.url
+      # RestClient.post "#{server}/hooks/heartbeat", {name: name}, content_type: :json, accept: :json
+      Slnky.brain.hset(:heartbeat, name, Time.now.to_i)
     end
 
     def notify(msg)

data/lib/slnky/brain.rb

@@ -0,0 +1,71 @@
+require 'redis'
+require 'json'
+
+module Slnky
+  class << self
+    def brain
+      Slnky::Brain::Base.instance
+    end
+  end
+  module Brain
+    class Base
+      class << self
+        def instance
+          @brain ||= self.new(Slnky.config.redis.to_h)
+        end
+
+        def connect(config)
+          @brain = self.new(config)
+        end
+      end
+
+      def initialize(redis={})
+        @options = {
+            host: '127.0.0.1',
+            port: 6379,
+            user: nil,
+            pass: nil,
+            db: '15'
+        }
+        @options.merge!(redis) if redis
+        userpass = @options[:user] ? "#{@options[:user]}:#{@options[:pass]}" : ''
+        @redis = Redis.new(url: "redis://#{userpass}#{@options[:host]}:#{@options[:port]}/#{@options[:db]}")
+      end
+
+      # def keys(pattern='*')
+      #   @redis.keys(pattern)
+      # end
+      #
+      # def set(key, value)
+      #   @redis.set key, value.is_a?(String) ? value : value.to_json
+      # end
+      #
+      # def get(key)
+      #   val = @redis.get key
+      #   begin
+      #     JSON.parse(val)
+      #   rescue
+      #     val
+      #   end
+      # end
+
+      def hset(key, field, value)
+        @redis.hset("slnky.#{key}", field, value.is_a?(String) ? value : value.to_json)
+      end
+
+      def hget(key, field)
+        val = @redis.hget("slnky.#{key}", field)
+        begin
+          JSON.parse(val)
+        rescue
+          val
+        end
+      end
+
+      def hgetall(key)
+        keys = @redis.hkeys("slnky.#{key}")
+        keys.inject({}) {|h, e| h[e] = hget(key, e); h}
+      end
+    end
+  end
+end

data/lib/slnky/command/response.rb

@@ -8,7 +8,6 @@ module Slnky
         if route =~ /\:/
           (route, reply) = route.split(':', 2)
         end
-        puts "ROUTE: #{route} #{reply}"
         @route = route
         @reply = reply
         @service = Slnky::System.pid

data/lib/slnky/service.rb

@@ -24,7 +24,7 @@ module Slnky
           subscriber.add "slnky.#{name}.command", :handle_command
           subscriber.add "slnky.help.command", :handle_command
           subscriber.add "slnky.service.restart", :handle_restart
-          timers.add 5.seconds, :handle_heartbeat unless config.development?
+          timers.add 5.seconds, :handle_heartbeat # unless config.development?
 
           subscriber.each do |name, method|
             log.info "subscribed to: #{name} -> #{self.class.name}.#{method}"
@@ -47,11 +47,8 @@ module Slnky
       end
 
       def handle_heartbeat
-        return if @server_down
+        # log.debug "heartbeat #{name}"
         Slnky.heartbeat(name)
-      rescue => e
-        log.info "could not post heartbeat, server down? #{e.message}"
-        @server_down = true
       end
 
       def subscriber

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.12.4"
+  VERSION = "0.13.0"
 end

data/slnky.gemspec

@@ -41,4 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'docopt', '~> 0.5.0'
   spec.add_dependency 'highline', '~> 1.7.8'
   spec.add_dependency 'colorize', '~> 0.7.7'
+  spec.add_dependency 'redis', '~> 3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: core slnky lib and command line
 email:
 - me@shawncatz.com
@@ -216,6 +230,7 @@ files:
 - lib/capistrano/slnky/templates/upstart.conf.erb
 - lib/capistrano/tasks/slnky.rake
 - lib/slnky.rb
+- lib/slnky/brain.rb
 - lib/slnky/cli.rb
 - lib/slnky/cli/command.rb
 - lib/slnky/cli/generate.rb