activehook-server 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1daf2a4c8b361684d24c4e94d847d061cca55d56
-  data.tar.gz: 88589eb56d60ef9bf609073600a7082d54f7dea6
+  metadata.gz: bba88b92233e06762c2fdbfb9d5137fc26127301
+  data.tar.gz: 71cba3618ff76f7e930a93a4a7506326d3397a31
 SHA512:
-  metadata.gz: a73d98636cd3caaa1bb66ecf21efdc9656195c736ab43de0559393f4c99f5b3b61536bbbd649b6c004c50dcc6ef6fd1d600e09453d577adf0d4f56091f576e2b
-  data.tar.gz: b56f6cb493a59947ff4e0d740f9384b1e72f030e87f3de306f2a07e73b89df8744652395518d4cc8bcfd0f978aece63818818d22a0ca5df29ef7dacff5f57d44
+  metadata.gz: 001d1161226e3f924e35321f133649f424df54f166e9b48330bdbf83d3595969ef9d8d934f5da946796874f03eacaee95baf8789abd9c3f80749d8c6913249f0
+  data.tar.gz: eecd5b4a4863ca3aeb7dde16b3327e4a6403be391a32970f7f115ac8e469721e59326a030f00eaa75d569ded33168d3f35155ad7a5512f4bde67e8dc738eb027

data/lib/activehook/server/config.rb

@@ -23,11 +23,14 @@ module ActiveHook
         retry_threads: 1,
         redis_url: ENV['REDIS_URL'],
         redis_pool: 5,
-        signature_header: 'X-Webhook-Signature'
+        signature_header: 'X-Message-Signature',
+        queue_namespace: 'ah:v1:queue',
+        retry_namespace: 'ah:v1:retry'
       }.freeze
 
       attr_accessor :workers, :queue_threads, :retry_threads,
-                    :redis_url, :redis_pool, :signature_header
+                    :redis_url, :redis_pool, :signature_header,
+                    :queue_namespace, :retry_namespace
 
       def initialize
         DEFAULTS.each { |key, value| send("#{key}=", value) }

data/lib/activehook/server/launcher.rb

@@ -18,8 +18,8 @@ module ActiveHook
       private
 
       def start_message
-        ActiveHook::Server.log.info('ActiveHook Server starting!')
-        ActiveHook::Server.log.info("* Version #{ActiveHook::Server::VERSION}, codename: #{ActiveHook::Server::CODENAME}")
+        Server.log.info('ActiveHook Server starting!')
+        Server.log.info("* Version #{Server::VERSION}, codename: #{Server::CODENAME}")
       end
 
       # Parses the arguments passed through the command line.
@@ -30,7 +30,7 @@ module ActiveHook
 
           o.on('-c', '--config PATH', 'Load PATH for config file') do |arg|
             load(arg)
-            ActiveHook::Server.log.info("* Server config:  #{arg}")
+            Server.log.info("* Server config:  #{arg}")
           end
 
           o.on('-h', '--help', 'Prints this help') { puts o && exit }
@@ -39,7 +39,7 @@ module ActiveHook
       end
 
       def boot_manager
-        manager = Manager.new(ActiveHook::Server.config.manager_options)
+        manager = Manager.new(Server.config.manager_options)
         manager.start
       end
     end

data/lib/activehook/server/manager.rb

@@ -48,8 +48,8 @@ module ActiveHook
       # Information about the start process
       #
       def start_messages
-        ActiveHook::Server.log.info("* Workers: #{@workers}")
-        ActiveHook::Server.log.info("* Threads: #{@options[:queue_threads]} queue, #{@options[:retry_threads]} retry")
+        Server.log.info("* Workers: #{@workers}")
+        Server.log.info("* Threads: #{@options[:queue_threads]} queue, #{@options[:retry_threads]} retry")
       end
 
       # Validates our data before starting our Workers. Also instantiates our
@@ -62,17 +62,14 @@ module ActiveHook
       end
 
       def validate_redis
-        ActiveHook::Server.redis.with { |c| c.ping && c.quit }
+        Server.redis.with { |c| c.ping && c.quit }
       rescue
-        msg = 'Cound not connect to Redis.'
-        ActiveHook::Server.log.err(msg)
-        raise Errors::Manager, msg
+        raise Errors::Manager, 'Cound not connect to Redis.'
       end
 
       def validate_workers
         return if @workers.is_a?(Integer)
-        msg = 'Workers must be an Integer.'
-        raise Errors::Manager, msg
+        raise Errors::Manager, 'Workers must be an Integer.'
       end
 
       def validate_options

data/lib/activehook/server/message.rb

@@ -12,12 +12,12 @@ module ActiveHook
 
       def save
         return false unless valid?
-        save_hook
+        save_message
       end
 
       def save!
         raise Errors::Message, 'Message is invalid' unless valid?
-        save_hook
+        save_message
       end
 
       def payload=(payload)
@@ -76,10 +76,10 @@ module ActiveHook
       private
 
       def save_message
-        ActiveHook::Server.redis.with do |conn|
-          @id = conn.incr('ah:total_queued')
-          conn.lpush('ah:queue', to_json)
-          conn.zadd('ah:validation', @id, @key)
+        Server.redis.with do |conn|
+          @id = conn.incr("#{Server.config.queue_namespace}:total")
+          conn.lpush(Server.config.queue_namespace, to_json)
+          conn.zadd("#{Server.config.queue_namespace}:validations", @id, @key)
         end
       end
 

data/lib/activehook/server/queue.rb

@@ -28,7 +28,9 @@ module ActiveHook
       # Performs a 'blocking pop' on our redis queue list.
       #
       def retrieve_message
-        json = ActiveHook::Server.redis.with { |c| c.brpop('ah:queue') }
+        json = Server.redis.with do |c|
+          c.brpop(Server.config.queue_namespace)
+        end
         json.last if json
       end
     end
@@ -42,7 +44,7 @@ module ActiveHook
 
       def start
         @post.start
-        ActiveHook::Server.redis.with do |conn|
+        Server.redis.with do |conn|
           @post.success? ? message_success(conn) : message_failed(conn)
         end
       end
@@ -50,13 +52,13 @@ module ActiveHook
       private
 
       def message_success(conn)
-        conn.incr('ah:total_success')
+        conn.incr("#{Server.config.queue_namespace}:success")
       end
 
       def message_failed(conn)
-        conn.incr('ah:total_failed')
+        conn.incr("#{Server.config.queue_namespace}:failed")
         return unless @message.retry?
-        conn.zadd('ah:retry', @message.retry_at, @message.to_json)
+        conn.zadd(Server.config.retry_namespace, @message.retry_at, @message.to_json)
       end
     end
   end

data/lib/activehook/server/redis.rb

@@ -10,8 +10,8 @@ module ActiveHook
 
     class ConnectionPool
       def self.create
-        ::ConnectionPool.new(size: ActiveHook::Server.config.redis_pool) do
-          Redis.new(url: ActiveHook::Server.config.redis_url)
+        ::ConnectionPool.new(size: Server.config.redis_pool) do
+          Redis.new(url: Server.config.redis_url)
         end
       end
     end

data/lib/activehook/server/retry.rb

@@ -7,8 +7,8 @@ module ActiveHook
 
       def start
         until @done
-          ActiveHook::Server.redis.with do |conn|
-            conn.watch('ah:retry') do
+          Server.redis.with do |conn|
+            conn.watch(Server.config.retry_namespace) do
               retries = retrieve_retries(conn)
               update_retries(conn, retries)
             end
@@ -24,15 +24,15 @@ module ActiveHook
       private
 
       def retrieve_retries(conn)
-        conn.zrangebyscore('ah:retry', 0, Time.now.to_i)
+        conn.zrangebyscore(Server.config.retry_namespace, 0, Time.now.to_i)
       end
 
       def update_retries(conn, retries)
         if retries.any?
           conn.multi do |multi|
-            multi.incrby('ah:total_retries', retries.count)
-            multi.zrem('ah:retry', retries)
-            multi.lpush('ah:queue', retries)
+            multi.incrby("#{Server.config.retry_namespace}:total", retries.count)
+            multi.zrem(Server.config.retry_namespace, retries)
+            multi.lpush(Server.config.queue_namespace, retries)
           end
         else
           conn.unwatch

data/lib/activehook/server/send.rb

@@ -4,7 +4,7 @@ module ActiveHook
       REQUEST_HEADERS = {
         "Content-Type" => "application/json",
         "Accept"       => "application/json",
-        "User-Agent"   => "ActiveHook/#{ActiveHook::Server::VERSION}"
+        "User-Agent"   => "ActiveHook/#{Server::VERSION}"
       }.freeze
 
       attr_accessor :message
@@ -60,9 +60,9 @@ module ActiveHook
       def log_status
         msg = "POST | #{uri} | #{status.upcase} #{response_time}"
         if status == :success
-          ActiveHook::Server.log.info(msg)
+          Server.log.info(msg)
         else
-          ActiveHook::Server.log.err(msg)
+          Server.log.err(msg)
         end
       end
 

data/lib/activehook/server/version.rb

@@ -1,6 +1,6 @@
 module ActiveHook
   module Server
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
     CODENAME = 'Fat Sparrow'
   end
 end

data/lib/activehook/server/worker.rb

@@ -58,13 +58,13 @@ module ActiveHook
       # Information about the start process
       #
       def start_message
-        ActiveHook::Server.log.info("* Worker #{@id} started, pid: #{@pid}")
+        Server.log.info("* Worker #{@id} started, pid: #{@pid}")
       end
 
       # Information about the shutdown process
       #
       def shutdown_message
-        ActiveHook::Server.log.info("* Worker #{@id} shutdown, pid: #{@pid}")
+        Server.log.info("* Worker #{@id} shutdown, pid: #{@pid}")
       end
 
       # Validates our data before starting the worker.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activehook-server
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis