ksconnect 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2d0b755faec329cae3ccad771d1fb9800f86d6
-  data.tar.gz: 26895da666049b7027f9b0d5c420eddf9fdaf94a
+  metadata.gz: 1d91fc4dd993ead89d5e76a124852edf2a6090b8
+  data.tar.gz: e4af39026299c2e5652396a489c7c0c373d7f87c
 SHA512:
-  metadata.gz: 905ea8c2bd106eef90ae780556e0965c5d7545ca01ab52c84678a31728d394c8962d22a0fb682f7b4a3d09b04fe2126743fd1f4da761f08f9dbe2d93cdc971a3
-  data.tar.gz: 6b27a9f2d093170cad26551f7b578a59591b89a2e3fd8d3c223fb99c7b7c40fc58c8b5652be9dcf7787791a666cc5b5b40a12efdeb9c5617539557428c06bf18
+  metadata.gz: 1aef855195621760ce29beb37fb2f8c383877fc5a770c3627b98b2c67e87da71931803948def0791199efcd00b4b6346b78bb6f53f34d4f3850c2da33eee5288
+  data.tar.gz: 863962b0a6c006e814dd5b6d810222be3541db1804f4c1b027a2cf50cdcf546b0e10085292b5b4875f8368fdd0503462a93d649780560e600a50b462e950b271

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

@@ -1,11 +1,15 @@
+require 'ksconnect/logs'
+
 class KSConnect
   class API
     class Plugin
       class Config
+        include Logs
+
         attr_accessor :on_initialize, :on_update, :on_teardown, :on_push
 
         def initialize
-          @on_initialize = @on_update = @on_teardown = @on_push = lambda { |msg| "No callback set for msg: #{msg}" }
+          @on_initialize = @on_update = @on_teardown = @on_push = lambda { |msg| logger.debug "No callback set for msg: #{msg}" }
         end
       end
     end

data/lib/ksconnect/api.rb

@@ -16,7 +16,7 @@ class KSConnect
       # set the main plugin
       unless enabled_plugins.empty?
         main_plugin_name = enabled_plugins.shift
-        @plugin = @plugins[main_plugin_name] = KSConnect::API::Plugin.new(plugin_name.to_s, true)
+        @plugin = @plugins[main_plugin_name] = KSConnect::API::Plugin.new(main_plugin_name.to_s, true)
       end
 
       # init the other plugins

data/lib/ksconnect/helpers.rb

@@ -2,54 +2,54 @@ require 'active_support/core_ext/object/try'
 
 class KSConnect
   module Helpers
-    def ip_address_for(domain)
-      if all_domains[domain.name]
-        all_domains[domain.name].ip_address
+    def ip_address_for(domain_name)
+      if all_domains[domain_name]
+        all_domains[domain_name].ip_address
       else
         "kloudsec.com" # go to something safe if ip is invalid
       end
     end
 
-    def https_enabled?(domain)
-      k, c = ssl_key_and_cert_for(domain)
+    def https_enabled?(domain_name)
+      k, c = ssl_key_and_cert_for(domain_name)
       k && c
     end
 
-    def https_redirect_enabled?(domain)
-      https_enabled?(domain) && plugins[:ssl].domains[domain.name].data['redirect'] == "true"
+    def https_redirect_enabled?(domain_name)
+      https_enabled?(domain_name) && plugins[:ssl].domains[domain_name].data['redirect'] == "true"
     end
 
-    def https_rewriting_enabled?(domain)
-      https_enabled?(domain) && plugins[:ssl].domains[domain.name].data['rewriteHTTPS'] == "true"
+    def https_rewriting_enabled?(domain_name)
+      https_enabled?(domain_name) && plugins[:ssl].domains[domain_name].data['rewriteHTTPS'] == "true"
     end
 
-    def waf_enabled?(domain)
-      plugins[:web_shield].domains.has_key?(domain.name)
+    def waf_enabled?(domain_name)
+      plugins[:web_shield].domains.has_key?(domain_name)
     end
 
-    def waf_learning?(domain)
-      waf_enabled?(domain) && plugins[:web_shield].domains[domain.name].data['learning']
+    def waf_learning?(domain_name)
+      waf_enabled?(domain_name) && plugins[:web_shield].domains[domain_name].data['learning']
     end
 
-    def waf_location_config(domain)
-      waf_enabled?(domain) ? plugins[:web_shield].domains[domain.name].private_data['location.conf'] : ""
+    def waf_location_config(domain_name)
+      waf_enabled?(domain_name) ? plugins[:web_shield].domains[domain_name].private_data['location.conf'] : ""
     end
 
-    def waf_server_config(domain)
-      waf_enabled?(domain) ? plugins[:web_shield].domains[domain.name].private_data['server.conf'] : ""
+    def waf_server_config(domain_name)
+      waf_enabled?(domain_name) ? plugins[:web_shield].domains[domain_name].private_data['server.conf'] : ""
     end
 
-    def pagespeed_enabled?(domain)
-      plugins[:mod_cache].domains.has_key?(domain.name)
+    def pagespeed_enabled?(domain_name)
+      plugins[:mod_cache].domains.has_key?(domain_name)
     end
 
-    def pending_autossl?(domain)
-      p, k = autossl_verification_path_and_key_for(domain)
-      plugins[:autossl].domains.has_key?(domain.name) && p && k
+    def pending_autossl?(domain_name)
+      p, k = autossl_verification_path_and_key_for(domain_name)
+      plugins[:autossl].domains.has_key?(domain_name) && p && k
     end
 
-    def autossl_verification_path_and_key_for(domain)
-      d = plugins[:autossl].domains[domain.name].try(:private_data)
+    def autossl_verification_path_and_key_for(domain_name)
+      d = plugins[:autossl].domains[domain_name].try(:private_data)
       if d
         return d['verify_endpoint'], d['verify_content']
       else
@@ -57,9 +57,9 @@ class KSConnect
       end
     end
 
-    def ssl_key_and_cert_for(domain)
-      ssl = plugins[:ssl].domains[domain.name].try(:private_data)
-      autossl = plugins[:autossl].domains[domain.name].try(:private_data)
+    def ssl_key_and_cert_for(domain_name)
+      ssl = plugins[:ssl].domains[domain_name].try(:private_data)
+      autossl = plugins[:autossl].domains[domain_name].try(:private_data)
 
       if ssl && ssl['key'] && ssl['cert']
         return ssl['key'], ssl['cert']

data/lib/ksconnect/logs.rb

@@ -15,11 +15,12 @@ module Logs
 
   module ClassMethods
     def logger
-      return @@_logger if @@_logger
+      return @_logger if @_logger
 
-      @@_logger = Logger.new(STDOUT)
-      @@_logger.level = "Logger::#{ENV['LOG_LEVEL'] || 'INFO'}".constantize
-      @@_logger
+      STDOUT.sync = true
+      @_logger = Logger.new(STDOUT)
+      @_logger.level = "Logger::#{ENV['LOG_LEVEL'] || 'INFO'}".constantize
+      @_logger
     end
   end
-end
+end

data/lib/ksconnect.rb

@@ -34,25 +34,29 @@ class KSConnect
   end
 
   def self.thread_pool
+    Thread::Pool.abort_on_exception = true
     @@thread_pool ||= Thread.pool(MIN_THREADS, MAX_THREADS)
   end
 
   def self.channel(name)
     Thread.start do
       begin
-        Redis.new.subscribe(name) do |on|
+        Redis.new(driver: :hiredis).subscribe(name) do |on|
           logger.info "Subscribing to redis channel: #{name}"
           on.message do |_channel, message|
             thread_pool.process do
-              yield message
-              $stdout.flush
+              begin
+                yield message
+              rescue => error
+                logger.error "#{error.message} on redis channel #{name}:"
+                logger.error error
+              end
             end
           end
         end
       rescue => error
-        logger.error "#{error} on redis channel #{name}, restarting in 0.5s"
+        logger.error "Fatal error on redis channel #{name}, restarting in 0.5s"
         logger.error error.backtrace.join("\n")
-        $stdout.flush
         sleep 0.5
         retry
       end

metadata

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