activehook-server 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80925d2c8f3f969329dd4f904a6687364b864c9
-  data.tar.gz: 79f29100344fb84d475397ac7a62aede31b7c5ae
+  metadata.gz: ec7b771869365076f1cf3dbabfe47776dcc3d685
+  data.tar.gz: 49c351e933c44e2bc253d8c9f000920f581ab409
 SHA512:
-  metadata.gz: a346b717d2a4f8379c54ea8042ebde7ebd227058e4ea9ef9b3b7a3af7458645a611c11809deb1913652fb66657f8de3d429d485a17620b9a518855abd1dc8e98
-  data.tar.gz: 84a1a32edfac8b9c4ab6d1c089a365e4dc88ecfad66c3c5fc33b8b82d851cf48771c69fb98784e808d8a962664826e5f2de6ebb0d9f27bb1e350ae18334bcc41
+  metadata.gz: 6bc07465c80a02621a7a56be3c8ef409347b4e87ebb1071a7058b56a2dbc070683f462ff5715b14f756370b466fe86086c4f0292314265c1398616383cbb946f
+  data.tar.gz: ed4f26e1fb08076eb21e113b6cbb9388dc1f23817b0b4f16580502bf0cc7155d8c7ab87c74c0a56d0efb9c1c938c2faa0213e38ffac20092bdc1cedc485da2db

data/lib/activehook/server/errors.rb

@@ -1,12 +1,29 @@
 module ActiveHook
   module Server
     module Errors
-      class Config < StandardError; end
-      class Message < StandardError; end
-      class HTTP < StandardError; end
-      class Send < StandardError; end
-      class Server < StandardError; end
-      class Worker < StandardError; end
+      class Base < StandardError
+        def initialize(msg = nil)
+          @message = msg
+          log_error
+        end
+
+        def message
+          "The following error occured: #{@message}"
+        end
+
+        private
+
+        def log_error
+          ActiveHook::Server.log.err(@message)
+        end
+      end
+
+      class Config < Base; end
+      class Message < Base; end
+      class HTTP < Base; end
+      class Send < Base; end
+      class Manager < Base; end
+      class Worker < Base; end
     end
   end
 end

data/lib/activehook/server/manager.rb

@@ -10,6 +10,7 @@ module ActiveHook
       def initialize(options = {})
         options.each { |key, value| send("#{key}=", value) }
         @master = Process.pid
+        @forks = []
         at_exit { shutdown }
       end
 
@@ -27,7 +28,9 @@ module ActiveHook
       # Shutsdown our Worker processes.
       #
       def shutdown
-        @forks.each { |w| Process.kill('SIGINT', w[:pid].to_i) }
+        unless @forks.empty?
+          @forks.each { |w| Process.kill('SIGINT', w[:pid].to_i) }
+        end
         Process.kill('SIGINT', @master)
       end
 
@@ -36,7 +39,6 @@ module ActiveHook
       # Create the specified number of workers and starts them
       #
       def create_workers
-        @forks = []
         @workers.times do |id|
           pid = fork { Worker.new(@options.merge(id: id)).start }
           @forks << { id: id, pid: pid }
@@ -54,9 +56,28 @@ module ActiveHook
       # connection pool by pinging Redis.
       #
       def validate!
-        raise Errors::Server, 'Cound not connect to Redis.' unless ActiveHook::Server.redis.with { |c| c.ping && c.quit }
-        raise Errors::Server, 'Workers must be an Integer.' unless @workers.is_a?(Integer)
-        raise Errors::Server, 'Options must be a Hash.' unless @options.is_a?(Hash)
+        validate_redis
+        validate_workers
+        validate_options
+      end
+
+      def validate_redis
+        ActiveHook::Server.redis.with { |c| c.ping && c.quit }
+      rescue
+        msg = 'Cound not connect to Redis.'
+        ActiveHook::Server.log.err(msg)
+        raise Errors::Manager, msg
+      end
+
+      def validate_workers
+        return if @workers.is_a?(Integer)
+        msg = 'Workers must be an Integer.'
+        raise Errors::Manager, msg
+      end
+
+      def validate_options
+        return if @options.is_a?(Hash)
+        raise Errors::Manager, 'Options must be a Hash.'
       end
     end
   end

data/lib/activehook/server/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activehook-server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nicholas Sweeting