ksconnect 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01bb45ec16d68199879715b17d8926ba15a23f5d
-  data.tar.gz: 0b62b79b1bf8d5b9deaa7aeb3aac0b85844486df
+  metadata.gz: e06a4a726ae9d277d8c455a9091a5720999d955e
+  data.tar.gz: 86b4fde365fbc5b5d4b9a57325920dee13749b71
 SHA512:
-  metadata.gz: ec46f07360b655b7fb433d56f73b6d7c51adcfaad60c2db91577449c38de641aa4ed4eeb0db37708508ab78757a06211882197e72d872a7dc2ada76212e75ad2
-  data.tar.gz: 55743f59b294f8f6d2336bca125019867d29efbfb7d80edfa982a16c5ce470c53b9aa08593912c93edd8e62c64d1479eb4e99c75ca4b59ddf7344057769c1f3a
+  metadata.gz: e83a4b54c544587f3b7390f22ac1fc690d0e9ae19884454792ec56ee48ccf82357751bf2371c920e20e755f91db57a7140a216435476e4f1c686501e06d8c34d
+  data.tar.gz: 58bd856484abb32f1a18e4112b5519e1373d6de0a6c012e92a6bde957d7afdc60b9521412a6be620780e1e0f41cdfad4cd5eb196d5c0437e9e9bc4952dead89f

data/lib/ksconnect.rb

@@ -6,6 +6,7 @@ require 'ksconnect/api/plugin/data'
 require 'ksconnect/api/plugin/domain'
 require 'ksconnect/helpers'
 require 'ksconnect/logs'
+require 'thread/pool'
 
 class KSConnect
   include Logs
@@ -26,17 +27,23 @@ class KSConnect
     @api = KSConnect::API.new(enabled_plugins: plugins, use_helpers: additional_options[:use_helpers])
   end
 
+  def self.thread_pool
+    @@thread_pool ||= Thread.pool(3, 50)
+  end
+
   def self.channel(name)
     Thread.start do
       begin
         Redis.new.subscribe(name) do |on|
-          logger.info "Subscribing to redis channel: #{name}"
-          on.message do |channel, message|
-            yield message
+          thread_pool.process do
+            logger.info "Subscribing to redis channel: #{name}"
+            on.message do |_channel, message|
+              yield message
+            end
+            $stdout.flush
           end
-          $stdout.flush
         end
-      rescue Exception => error
+      rescue => error
         logger.error "#{error} on redis channel #{name}, restarting in 0.5s"
         logger.error error.backtrace.join("\n")
         $stdout.flush

data/lib/ksconnect/api/plugin.rb

@@ -54,11 +54,30 @@ class KSConnect
           if %w(initialize update teardown).include? msg['request_type']
             perform_request(msg)
           else
-            config.on_push.call(message)
+            begin
+              result = config.on_push.call(msg)
+              update_action(msg["action_uuid"], :done, result) if msg["action_uuid"]
+            rescue => e
+              update_action(msg["action_uuid"], :failed, "") if msg["action_uuid"]
+              raise e
+            end
           end
         end
       end
 
+      def update_action(action_id, state, body="")
+        raise "Updating action with empty action_id" if action_id.nil? or action_id.empty?
+        redis.multi do |redis_transaction|
+          redis_transaction.mapped_hmset "kloudsec_data:#{action_id}", {
+            plugin_name: @name,
+            uuid: action_id,
+            state: state,
+            response: body,
+          }
+          redis_transaction.expire "kloudsec_data:#{action_id}", 300
+        end
+      end
+
       def perform_request(request)
         request.stringify_keys!
 

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

@@ -30,15 +30,15 @@ class KSConnect
         end
 
         def notify(data)
-          redis.lpush("kloudsec_notifications", data.merge({ domain_name: @name, plugin_name: @plugin_name }))
+          redis.lpush("ks:notifications_push", data.merge({ domain_name: @name, plugin_name: @plugin_name }))
         end
 
         def add_issue(issue_type, data)
-          redis.lpush("kloudsec_issues", data.merge({ domain_name: @name, plugin_name: @plugin_name, issue_type: issue_type, request_type: 'add' }))
+          redis.lpush("ks:issues_push", data.merge({ domain_name: @name, plugin_name: @plugin_name, issue_type: issue_type, request_type: 'add' }))
         end
 
         def clear_issue(issue_type)
-          redis.lpush("kloudsec_issues", { domain_name: @name, plugin_name: @plugin_name, issue_type: issue_type, request_type: 'remove' })
+          redis.lpush("ks:issues_push", { domain_name: @name, plugin_name: @plugin_name, issue_type: issue_type, request_type: 'remove' })
         end
 
         private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksconnect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Ivan Poon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -95,4 +95,3 @@ signing_key:
 specification_version: 4
 summary: Connection API for Kloudsec
 test_files: []
-has_rdoc: