herdst_worker 0.1.6 → 0.1.9

data/lib/herdst_worker/log/facade.rb

@@ -1,87 +1,87 @@
-require 'logger'
-
-
-module HerdstWorker
-    module Log
-        
-        
-        DEFAULT_PROGNAME = "application"
-        
-        
-        class Facade
-            
-            
-            attr_accessor :logger, :progname, :single_line, :level
-            
-            
-            def initialize(level = "DEBUG", progname = DEFAULT_PROGNAME, single_line = false)
-                self.progname = progname
-                self.single_line = single_line
-                
-                self.logger = Logger.new(STDOUT)
-                self.logger.progname = self.get_progname(progname)
-                self.set_log_level(level)
-            end
-            
-            
-            def set_log_level(level)
-                self.level = level
-                self.logger.level = Logger.const_get(level)
-            end
-            
-            
-            def debug(*attributes)
-                write_message :debug, attributes
-            end
-            
-            
-            def info(*attributes)
-                write_message :info, attributes
-            end
-            
-            
-            def warn(*attributes)
-                write_message :warn, attributes
-            end
-            
-            
-            def error(*attributes)
-                write_message :error, attributes
-            end
-            
-            
-            def fatal(*attributes)
-                write_message :fatal, attributes
-            end
-            
-            
-            def method_missing(name)
-                full_name = self.progname === DEFAULT_PROGNAME ? 
-                    name : 
-                    "#{self.progname}.#{name}"
-                
-                Facade.new(self.level, full_name, self.single_line)
-            end
-            
-            
-            def write_message(type, message)
-                if self.single_line
-                    full_message = message.map { |i| i.to_s }.join(" ")
-                else
-                    full_message = message.map { |i| i.to_s }.join("\n")
-                end
-                
-                self.logger.send(type, full_message)
-            end
-            
-            
-            protected
-                def get_progname(name)
-                    "[#{name.upcase}]"
-                end
-            
-            
-        end
-        
-    end
-end
+require 'logger'
+
+
+module HerdstWorker
+    module Log
+        
+        
+        DEFAULT_PROGNAME = "application"
+        
+        
+        class Facade
+            
+            
+            attr_accessor :logger, :progname, :single_line, :level
+            
+            
+            def initialize(level = "DEBUG", progname = DEFAULT_PROGNAME, single_line = false)
+                self.progname = progname
+                self.single_line = single_line
+                
+                self.logger = Logger.new(STDOUT)
+                self.logger.progname = self.get_progname(progname)
+                self.set_log_level(level)
+            end
+            
+            
+            def set_log_level(level)
+                self.level = level
+                self.logger.level = Logger.const_get(level)
+            end
+            
+            
+            def debug(*attributes)
+                write_message :debug, attributes
+            end
+            
+            
+            def info(*attributes)
+                write_message :info, attributes
+            end
+            
+            
+            def warn(*attributes)
+                write_message :warn, attributes
+            end
+            
+            
+            def error(*attributes)
+                write_message :error, attributes
+            end
+            
+            
+            def fatal(*attributes)
+                write_message :fatal, attributes
+            end
+            
+            
+            def method_missing(name)
+                full_name = self.progname === DEFAULT_PROGNAME ? 
+                    name : 
+                    "#{self.progname}.#{name}"
+                
+                Facade.new(self.level, full_name, self.single_line)
+            end
+            
+            
+            def write_message(type, message)
+                if self.single_line
+                    full_message = message.map { |i| i.to_s }.join(" ")
+                else
+                    full_message = message.map { |i| i.to_s }.join("\n")
+                end
+                
+                self.logger.send(type, full_message)
+            end
+            
+            
+            protected
+                def get_progname(name)
+                    "[#{name.upcase}]"
+                end
+            
+            
+        end
+        
+    end
+end

data/lib/herdst_worker/queue/facade.rb

@@ -1,162 +1,164 @@
-require 'securerandom'
-require_relative 'processor'
-
-
-module HerdstWorker
-    module Queue
-        class Facade
-            
-            
-            attr_accessor :app, :processor
-            
-            
-            def initialize(app, enabled, url, queue_wait_time)
-                self.app = app
-                self.processor = HerdstWorker::Queue::Processor.new(app, enabled, url, queue_wait_time)
-            end
-            
-            
-            def get_status
-                self.processor.processor_status
-            end
-            
-            
-            def start
-                self.processor.start
-            end
-            
-            
-            def halt
-                self.processor.halt
-            end
-            
-            
-            def stop
-                self.processor.stop
-            end
-            
-            
-            def get_processor
-                self.processor
-            end
-            
-            
-            def send_message(type, company_id, user_id, data = {}, queue = :primary, attributes = nil, delay = nil)
-                client = get_queue_client(queue)
-                message = create_queue_message(type, company_id, user_id, data, attributes, delay)
-                message.delete(:id)
-                
-                client.send_message(message)
-            end
-            
-            
-            def send_messages(messages = [], queue = :primary)
-                client = get_queue_client(queue)
-                
-                messages.each_slice(10) do |messages_group|
-                    client.send_messages({ :entries => messages_group })
-                end
-            end
-            
-            
-            def send_email_message(template, company, data = {}, attributes = nil, delay = nil)
-                client = get_queue_client(:notifications)
-                
-                message = create_email_queue_message(template, company, data, attributes, delay)
-                message.delete(:id)
-                
-                client.send_message(message)
-            end
-            
-            
-            def create_queue_message(type, company_id, user_id, data, attributes = nil, delay = nil)
-                message = Hash.new
-                message[:id] = SecureRandom.hex(32)
-                message[:message_body] = Hash.new
-                message[:message_body][:eventVersion] = 1.0
-                message[:message_body][:eventSource] = "application:Que"
-                message[:message_body][:eventTime] = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
-                message[:message_body][:eventName] = type.to_s.camelize(:lower)
-                message[:message_body][:userIdentity] = { :principalId => user_id, :companyId => company_id }
-                message[:message_body][:Que] = data
-                message[:message_body][:Que][:configurationId] = message[:message_body][:eventName]
-            
-                message[:message_body] = { :Records => [message[:message_body]] }.to_json
-                message[:message_attributes] = attributes if attributes
-                message[:delay_seconds] = delay if delay
-                message
-            end
-            
-            
-            def create_email_queue_message(template, company, message_data, attributes = nil, delay = 2)
-                # Convert instances of ApplicationRecord to attributes instead of json representation
-                message_data.each do |key, value|
-                    message_data[key] = value.attributes if value.is_a?(ActiveRecord::Base)
-                end
-                
-                # Build data
-                data = Hash.new
-                data[:app] = self.app.name
-                data[:app_id] = company.id
-                data[:app_name] = company.name
-                data[:app_slug] = company.get_host_name
-                data[:app_brand_id] = company.brand_id
-                data[:app_host] = company.get_url
-                data[:type] = "email"
-                data[:template] = template
-                data[:data] = message_data
-                
-                # Add message structure
-                message = Hash.new
-                message[:id] = SecureRandom.hex(32)
-                message[:message_body] = data.to_json
-                message[:message_attributes] = attributes if attributes
-                message[:delay_seconds] = delay
-                message
-            end
-            
-            
-            def create_notification_message(message_data, attributes = nil, expiry = nil, delay = nil)
-                message = Hash.new
-                message[:id] = SecureRandom.hex(32)
-                message[:message_body] = Hash.new
-                message[:message_body][:Type] = "Notification"
-                message[:message_body][:Message] = message_data.to_json
-                message[:message_body] = message[:message_body].to_json
-                message[:message_attributes] = attributes ? attributes : Hash.new
-                message[:message_attributes]["expiry"] = { :string_value => expiry.to_s, :data_type => "Number" } if expiry
-                message[:delay_seconds] = delay if delay
-                
-                message.delete(:message_attributes) if message[:message_attributes].size == 0
-                
-                message
-            end
-            
-            
-            def get_queue_client(queue_name)
-                queue_url = self.app.queues[queue_name]
-                sqs_client = Aws::SQS::Client.new(
-                    :credentials => self.app.config.metadata.get_aws_credentials
-                )
-                
-                Aws::SQS::Queue.new(
-                    :url => queue_url,
-                    :client => sqs_client
-                )
-            end
-            
-            
-            def self.get_delay(index)
-                messages_per_second = 10
-                send_time_per_message = 0.4
-                
-                offset = (index / messages_per_second)
-                delay = (offset * (messages_per_second * send_time_per_message)).to_i
-                
-                delay > 900 ? 900 : delay
-            end
-
-            
-        end
-    end
-end
+require 'securerandom'
+require_relative 'processor'
+
+
+module HerdstWorker
+    module Queue
+        class Facade
+            
+            
+            attr_accessor :app, :enabled, :url, :queue_wait_time, :processor
+            
+            
+            def initialize(app, enabled, url, queue_wait_time)
+                self.app = app
+                self.enabled = enabled
+                self.url = url
+                self.queue_wait_time = queue_wait_time
+            end
+            
+            
+            def get_status
+                self.get_processor.processor_status
+            end
+            
+            
+            def start
+                self.get_processor.start
+            end
+            
+            
+            def halt
+                self.get_processor.halt
+            end
+            
+            
+            def stop
+                self.get_processor.stop
+            end
+            
+            
+            def get_processor
+                unless self.processor
+                    self.processor = HerdstWorker::Queue::Processor.new(app, self.enabled, self.url, self.queue_wait_time)
+                end
+
+                self.processor
+            end
+            
+            
+            def send_message(type, company_id, user_id, data = {}, attributes = nil, delay = nil)
+                message = create_queue_message(type, company_id, user_id, data, attributes, delay)
+                message.delete(:id)
+                
+                get_queue_client.send_message(message)
+            end
+            
+            
+            def send_messages(messages = [])
+                client = get_queue_client
+                
+                messages.each_slice(10) do |messages_group|
+                    client.send_messages({ :entries => messages_group })
+                end
+            end
+            
+            
+            def send_email_message(template, company, data = {}, attributes = nil, delay = nil)
+                message = create_email_queue_message(template, company, data, attributes, delay)
+                message.delete(:id)
+                
+                get_queue_client.send_message(message)
+            end
+            
+            
+            def create_queue_message(type, company_id, user_id, data, attributes = nil, delay = nil)
+                message = Hash.new
+                message[:id] = SecureRandom.hex(32)
+                message[:message_body] = Hash.new
+                message[:message_body][:eventVersion] = 1.0
+                message[:message_body][:eventSource] = "application:Que"
+                message[:message_body][:eventTime] = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
+                message[:message_body][:eventName] = type.to_s.camelize(:lower)
+                message[:message_body][:userIdentity] = { :principalId => user_id, :companyId => company_id }
+                message[:message_body][:Que] = data
+                message[:message_body][:Que][:configurationId] = message[:message_body][:eventName]
+            
+                message[:message_body] = { :Records => [message[:message_body]] }.to_json
+                message[:message_attributes] = attributes if attributes
+                message[:delay_seconds] = delay if delay
+                message
+            end
+            
+            
+            def create_email_queue_message(template, company, message_data, attributes = nil, delay = 2)
+                # Convert instances of ApplicationRecord to attributes instead of json representation
+                message_data.each do |key, value|
+                    message_data[key] = value.attributes if value.is_a?(ActiveRecord::Base)
+                end
+                
+                # Build data
+                data = Hash.new
+                data[:app] = self.app.name
+                data[:app_id] = company.id
+                data[:app_name] = company.name
+                data[:app_slug] = company.get_host_name
+                data[:app_brand_id] = company.brand_id
+                data[:app_host] = company.get_url
+                data[:type] = "email"
+                data[:template] = template
+                data[:data] = message_data
+                
+                # Add message structure
+                message = Hash.new
+                message[:id] = SecureRandom.hex(32)
+                message[:message_body] = data.to_json
+                message[:message_attributes] = attributes if attributes
+                message[:delay_seconds] = delay
+                message
+            end
+            
+            
+            def create_notification_message(message_data, attributes = nil, expiry = nil, delay = nil)
+                message = Hash.new
+                message[:id] = SecureRandom.hex(32)
+                message[:message_body] = Hash.new
+                message[:message_body][:Type] = "Notification"
+                message[:message_body][:Message] = message_data.to_json
+                message[:message_body] = message[:message_body].to_json
+                message[:message_attributes] = attributes ? attributes : Hash.new
+                message[:message_attributes]["expiry"] = { :string_value => expiry.to_s, :data_type => "Number" } if expiry
+                message[:delay_seconds] = delay if delay
+                
+                message.delete(:message_attributes) if message[:message_attributes].size == 0
+                
+                message
+            end
+            
+            
+            def get_queue_client
+                sqs_client = Aws::SQS::Client.new(
+                    :credentials => self.app.config.metadata.get_aws_credentials
+                )
+                
+                Aws::SQS::Queue.new(
+                    :url => self.url,
+                    :client => sqs_client
+                )
+            end
+            
+            
+            def self.get_delay(index)
+                messages_per_second = 10
+                send_time_per_message = 0.4
+                
+                offset = (index / messages_per_second)
+                delay = (offset * (messages_per_second * send_time_per_message)).to_i
+                
+                delay > 900 ? 900 : delay
+            end
+
+            
+        end
+    end
+end