ksconnect 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9033ab93825f6763a35f296a758ea63777e7c3db
-  data.tar.gz: f6470fcf3b96720d6dd1e400999afbc96b9866aa
+  metadata.gz: 01bb45ec16d68199879715b17d8926ba15a23f5d
+  data.tar.gz: 0b62b79b1bf8d5b9deaa7aeb3aac0b85844486df
 SHA512:
-  metadata.gz: d1c5b726757accd1e09b23c93803316e049cafc7f8dfce9b91966f65a4de2adc26bd322aca158ca42a1463ae183c3f0f6ac4b2e820f24bae7ddfd11a38cb5da4
-  data.tar.gz: 8903eaae449f8fdbdcc7025aef062bfaace099bdf508881c4f7048c6416acf55a1a55ff2d14145bdfae1fe421309e6a6e01dbe0dab1d3956cf749dd62c745371
+  metadata.gz: ec46f07360b655b7fb433d56f73b6d7c51adcfaad60c2db91577449c38de641aa4ed4eeb0db37708508ab78757a06211882197e72d872a7dc2ada76212e75ad2
+  data.tar.gz: 55743f59b294f8f6d2336bca125019867d29efbfb7d80edfa982a16c5ce470c53b9aa08593912c93edd8e62c64d1479eb4e99c75ca4b59ddf7344057769c1f3a

data/lib/ksconnect/api/plugin/data.rb

@@ -1,10 +1,12 @@
 require 'redis'
 require 'active_support/hash_with_indifferent_access'
+require 'ksconnect/logs'
 
 class KSConnect
   class API
     class Plugin
       class Data
+        include Logs
         attr_reader :type
 
         def initialize(plugin_name, domain_name, type = :data, use_cache = true)
@@ -13,26 +15,26 @@ class KSConnect
           @type = type
           @use_cache = use_cache
 
-          @data = ActiveSupport::HashWithIndifferentAccess.new if @use_cache
-          @data_uuid = nil
+          @cache = ActiveSupport::HashWithIndifferentAccess.new if @use_cache
+          @cache_uuid = nil
         end
 
         def []=(field, value)
-          @data[field] = value if @use_cache
+          @cache[field] = value if @use_cache
           redis.hset(key, field, value)
-          redis.publish("core:push", { plugin_name: @plugin_name, domain_name: @domain_name, request_type: 'update' })
+          redis.publish("core:push", { plugin_name: @plugin_name, domain_name: @domain_name, request_type: 'update' }.to_json)
         end
 
         def setall(hash)
-          @data = @data.merge(hash) if @use_cache
+          @cache = @cache.merge(hash) if @use_cache
           redis.mapped_hmset(key, hash)
-          redis.publish("core:push", { plugin_name: @plugin_name, domain_name: @domain_name, request_type: 'update' })
+          redis.publish("core:push", { plugin_name: @plugin_name, domain_name: @domain_name, request_type: 'update' }.to_json)
         end
 
         def [](field)
           if @use_cache
-            @data ||= redis.hgetall(key)
-            @data[field]
+            @cache = redis.hgetall(key) if @cache.empty?
+            @cache[field]
           else
             redis.hget(key, field)
           end
@@ -40,24 +42,25 @@ class KSConnect
 
         def getall
           if @use_cache
-            @data ||= redis.hgetall(key)
+            @cache = redis.hgetall(key) if @cache.empty?; @cache
           else
             redis.hgetall(key)
           end
         end
 
         def reload
-          @data = redis.hgetall(key) if @use_cache
+          @cache = redis.hgetall(key) if @use_cache
+          @cache
         end
 
         def delete(field)
-          @data.delete(field) if @use_cache
+          @cache.delete(field) if @use_cache
           redis.hdel(key, field)
         end
 
         def key
-          set_data_uuid unless @data_uuid
-          "kloudsec_data:#{@data_uuid}"
+          set_data_uuid unless @cache_uuid
+          "kloudsec_data:#{@cache_uuid}"
         end
 
         private
@@ -67,10 +70,10 @@ class KSConnect
             tries ||= 3
             id = redis.hget("#{@plugin_name}:#{@type}", @domain_name)
             if id
-              @data_uuid = id
+              @cache_uuid = id
             else
-              @data_uuid = SecureRandom.uuid
-              raise "Race on setting data key failed." unless redis.hsetnx("#{@plugin_name}:#{@type}", @domain_name, @data_uuid)
+              @cache_uuid = SecureRandom.uuid
+              raise "Race on setting data key failed." unless redis.hsetnx("#{@plugin_name}:#{@type}", @domain_name, @cache_uuid)
             end
           rescue Exception => e
             logger.error e.message

data/lib/ksconnect/api/plugin/domain.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'json'
 
 class KSConnect
   class API
@@ -18,10 +19,14 @@ class KSConnect
           @private_data = Data.new(plugin_name, name, :private_data)
         end
 
+        def update_ip_address
+          @ip_address = redis.hget(domains_key, name)
+        end
+
         def ip_address=(new_ip)
           @ip_address = new_ip
           redis.hset(domains_key, name, new_ip)
-          redis.publish("core:push", { domain_name: name, plugin_name: "core", request_type: "update"}) if plugin_name == 'core'
+          redis.publish("core:push", { domain_name: name, plugin_name: "core", request_type: "update"}.to_json) if plugin_name == 'core'
         end
 
         def notify(data)

data/lib/ksconnect/api/plugin.rb

@@ -1,15 +1,18 @@
 require 'redis'
 require 'json'
+require 'ksconnect/logs'
 
 class KSConnect
   class API
     class Plugin
+      include Logs
       attr_accessor :domains
       attr_reader :name
       attr_writer :config
 
-      def initialize(name)
+      def initialize(name, main = false)
         @name = name
+        @main_plugin = main
         @domains = {}
 
         load_domains
@@ -39,11 +42,12 @@ class KSConnect
       end
 
       def subscribe_to_events
-        KSConnect.channel("#{name}:push") do |message|
+        KSConnect.channel("#{@name}:push") do |message|
           begin
             msg = JSON.parse(message)
           rescue Exception => e
-            logger.error "Error parsing message as JSON: #{msg}"
+            logger.error e
+            logger.error "Error parsing message as JSON: #{message}"
             next
           end
 
@@ -67,7 +71,7 @@ class KSConnect
             @domains[domain_name] = Domain.new(domain_name, get_ip_for(domain_name), @name)
             config.on_initialize.call(request)
           when 'update'
-            @domains[domain_name].ip_address = get_ip_for(domain_name)
+            @domains[domain_name].update_ip_address
             config.on_update.call(request)
           when 'teardown'
             @domains.delete(domain_name)
@@ -76,7 +80,7 @@ class KSConnect
             raise "Invalid request type"
         end
 
-        redis.publish("core:push", { domain_name: domain_name, plugin_name: @name, request_type: request_type }.to_json) unless plugin_is_core?
+        redis.publish("core:push", { domain_name: domain_name, plugin_name: @name, request_type: request_type }.to_json) if should_repush?
       end
 
       def domains_key
@@ -86,8 +90,8 @@ class KSConnect
 
       private
 
-      def plugin_is_core?
-        @name == 'core'
+      def should_repush?
+        @main_plugin && @name != 'core'
       end
 
       def get_ip_for(domain_name)

data/lib/ksconnect/api.rb

@@ -5,9 +5,24 @@ class KSConnect
 
     def initialize(opts)
       enabled_plugins = *opts[:enabled_plugins] || []
-      plugins = enabled_plugins.unshift(:core).uniq # always load core first
-      @plugins = plugins.reduce({}) { |hash, plugin_name| hash.tap { |h| h[plugin_name] = KSConnect::API::Plugin.new(plugin_name.to_s) } }
-      @plugin = @plugins[*opts[:enabled_plugins].first || :core]
+
+      # init the plugins that will be used
+      @plugins = {}
+
+      # always init the core plugin
+      enabled_plugins.delete(:core)
+      @plugins[:core] = KSConnect::API::Plugin.new('core', enabled_plugins.empty?)
+
+      # set the main plugin
+      unless enabled_plugins.empty?
+        plugin_name = enabled_plugins.shift
+        @plugin = @plugins[plugin_name] = KSConnect::API::Plugin.new(plugin_name.to_s, true)
+      end
+
+      # init the other plugins
+      enabled_plugins.each do |plugin_name|
+        @plugins[plugin_name] = KSConnect::API::Plugin.new(plugin_name.to_s)
+      end
 
       if opts[:use_helpers]
         extend KSConnect::Helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ksconnect
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ivan Poon