onesnooper-server 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f1ae82991565bbc54d357c7f56a52e01d6a493
-  data.tar.gz: 9b0a7f57c37cc1e27070ac5c8d9c1f831fa05a67
+  metadata.gz: 3f95a623aeecca71c8a9cdeef948e88d977b9d6c
+  data.tar.gz: 7e1eda07d750ed7248570031d76549a3c3e838d0
 SHA512:
-  metadata.gz: 01dfada0d5bde06a121d869f7c6de9ecca3c064b784479639a50601111f396b9f85d55a9c883aa0e7782def249f949bd681ce18ea8f041c16681bb1a06ddc0e1
-  data.tar.gz: 0ca39c08ef780ea2a472d74754ec7ba6dc73c4568a5dd8c81010eeb5d622aa6b44a67c6db86cf941e8075a7e8b827e41d949122a4e8de19c53b88413e6ee8a30
+  metadata.gz: 33e7705f7f0f5faca48b3393ff4306d3883cbab53bee8bacca735fc5d83adf1a012ffc1a97ad0d98640b47b2a846f669207485a28e5e5bde0988124f995e2535
+  data.tar.gz: 07569b715d3baabc873c442bc618edb93c09ac4b67c362667cd373e0ef466d01e1180bda12f5a1e8707292d6108856b42bd679ebe7a6bee247906e3c30cadfc7

data/lib/onesnooper_server/request_handler.rb

@@ -15,14 +15,6 @@ class OnesnooperServer::RequestHandler
   }
   DATAGRAMS.default = ::OnesnooperServer::Datagrams::InvalidDatagram
 
-  # Registered allowed stores for monitoring data
-  STORES = {
-    "mongodb" => ::OnesnooperServer::Stores::MongodbStore,
-    "mysql"   => ::OnesnooperServer::Stores::MysqlStore,
-    "sqlite"  => ::OnesnooperServer::Stores::SqliteStore,
-  }
-  STORES.default = ::OnesnooperServer::Stores::InvalidStore
-
   # Static parsing method for identifying types of incoming datagrams
   # and choosing the right processing class for each datagram. Always
   # returns an instance responding to `run(callback)`.
@@ -30,7 +22,8 @@ class OnesnooperServer::RequestHandler
   # @param monitoring_datagram [Object] datagram payload for processing
   # @param source_ip [String] IP address of the client
   # @param source_port [String] port number of the client
-  def self.parse(monitoring_datagram, source_ip, source_port)
+  # @param store_instances [Array] array of pre-initialized store instances
+  def self.parse(monitoring_datagram, source_ip, source_port, store_instances)
     unless valid_data?(monitoring_datagram)
       ::OnesnooperServer::Log.error "[#{self.name}] Dropping invalid monitoring data #{monitoring_datagram.inspect}"
       return DATAGRAMS.default.new
@@ -85,15 +78,4 @@ private
     false
   end
 
-  # Retrieves a list of instances for allowed store backends.
-  #
-  # @return [Array] list of store instances
-  def self.store_instances
-    ::OnesnooperServer::Settings.store.collect do |store_name|
-      STORES[store_name].new(
-        ::OnesnooperServer::Settings.stores.respond_to?(store_name) ? ::OnesnooperServer::Settings.stores.send(store_name) : {}
-      )
-    end
-  end
-
 end

data/lib/onesnooper_server/udp_handler.rb

@@ -4,8 +4,25 @@
 # mirrored monitoring traffic.
 class OnesnooperServer::UDPHandler < ::EventMachine::Connection
 
+  # Allowed datagram prefix
   DATAGRAM_PREFIX = 'MONITOR'
 
+  # Registered allowed stores for monitoring data
+  STORES = {
+    "mongodb" => ::OnesnooperServer::Stores::MongodbStore,
+    "mysql"   => ::OnesnooperServer::Stores::MysqlStore,
+    "sqlite"  => ::OnesnooperServer::Stores::SqliteStore,
+  }
+  STORES.default = ::OnesnooperServer::Stores::InvalidStore
+
+  def initialize(*args)
+    super
+    @store_instances = store_instances(
+      ::OnesnooperServer::Settings.store,
+      ::OnesnooperServer::Settings.stores
+    )
+  end
+
   # Receives data and triggers processing of the given
   # datagram. Main internal processing triggered from this
   # method should always happen asynchronously (i.e., using
@@ -26,7 +43,8 @@ class OnesnooperServer::UDPHandler < ::EventMachine::Connection
     ::OnesnooperServer::RequestHandler.parse(
       monitoring_datagram,
       source_ip,
-      source_port
+      source_port,
+      @store_instances
     ).run(callback)
   end
 
@@ -47,4 +65,20 @@ private
     def_deferr
   end
 
+  # Retrieves a list of instances for allowed store backends.
+  #
+  # @param enabled_stores [Hash] hash-like list of enabled stores
+  # @param store_configs [Hash] hash-like set of store configurations
+  # @return [Array] list of store instances
+  def store_instances(enabled_stores, store_configs)
+    fail "No stores have been enabled, see configuration file" if enabled_stores.blank?
+    fail "No store configuration present, see configuration file" if store_configs.blank?
+
+    enabled_stores.collect do |store_name|
+      STORES[store_name].new(
+        store_configs.respond_to?(store_name) ? store_configs.send(store_name) : {}
+      )
+    end
+  end
+
 end

data/lib/onesnooper_server/version.rb

@@ -1,4 +1,4 @@
 module OnesnooperServer
   # Static version information
-  VERSION = "0.0.3" unless defined?(::OnesnooperServer::VERSION)
+  VERSION = "0.0.4" unless defined?(::OnesnooperServer::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesnooper-server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler