kstats-node 1.0.1 → 1.0.2

data/bin/kstats-node

@@ -2,13 +2,6 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-
-class Time
-  def to_db
-    strftime "%Y%m%d%H%M%S"
-  end
-end
-
 require 'optparse'
 require 'yaml'
 require 'kstats/node'
@@ -20,18 +13,31 @@ optparse = OptionParser.new do |opts|
 
   opts.on('-h', '--help', 'Show help screen'){ puts opts; exit }
 
-  opts.on('-c', '--config CONF', 'Set configuration file') do |config|
+  opts.on('-c', '--config CONF', 'Set configuration file (required)') do |config|
     options[:config] = config
   end
 end
 
 optparse.parse!
-require 'sinatra'
 
 #Parse the configuration file:
+if options[:config].nil?
+  puts optparse
+  exit
+end
+
+require 'sinatra'
+
+puts "KStats::Node"
+
+puts "Load configuration file"
 config = YAML::load(File.read(options[:config]))
-Kstats::Node::CONFIG.merge!(config)
+Kstats::Node::Config.init(config)
+
+set :port, Kstats::Node::Config['server.port', 4567].to_i
+set :bind, Kstats::Node::Config['server.bind', '0.0.0.0']
 
+puts "Initialize database"
 Kstats::Node::Database.init
 
 get '/probes/list' do
@@ -82,3 +88,5 @@ get '/probe/:id/:target' do
 end
 
 Kstats::Node::Worker.launch!
+
+puts "Service is launched"

data/lib/kstats/node/config.rb

@@ -1,5 +1,38 @@
 module Kstats
   module Node
-    CONFIG={}
+    module Config
+      def self.init config_file
+        @config ||= {}
+        @config.merge!(config_file)
+      end
+
+      def self.[] key, default = nil
+        path = key.to_s.split(/\./)
+
+        explore_path(path) || default
+      end
+
+      private
+
+      def self.explore_path path, current = nil, idx=0
+        if idx == 0 && current.nil?
+          current = @config
+        end
+
+        if current.nil?
+          nil
+        else
+          if idx == path.count-1
+            if current.instance_of?(Hash)
+              current[path[idx]]
+            else
+              nil
+            end
+          else
+            explore_path path, current[path[idx]], idx+1
+          end
+        end
+      end
+    end
   end
 end

data/lib/kstats/node/database.rb

@@ -7,7 +7,7 @@ module Kstats
         attr_reader :db
 
         def init
-          @db = SQLite3::Database.new( Kstats::Node::CONFIG['db_dir'] )
+          @db = SQLite3::Database.new( Kstats::Node::Config['db_dir'] )
           @db.execute [
             "CREATE TABLE IF NOT EXISTS probe_data (id INTEGER PRIMARY KEY ASC, date DATETIME, period_type STRING, probe_id STRING, probe_key STRING, probe_value NUMBER)",
             "CREATE INDEX IF NOT EXISTS probe_data_period_type ON probe_data(period_type)",
@@ -26,7 +26,7 @@ module Kstats
 
           probes.each do |name, values|
             @db.close
-            @db = SQLite3::Database.new( Kstats::Node::CONFIG['db_dir'] )
+            @db = SQLite3::Database.new( Kstats::Node::Config['db_dir'] )
 
             sql = <<SQL
 INSERT INTO probe_data (date, period_type, probe_id, probe_key, probe_value)

data/lib/kstats/node/probe.rb

@@ -30,7 +30,7 @@ module Kstats
           @fixed_registered = @registered
           @registered = []
 
-          dir = Kstats::Node::CONFIG['probes_dir']
+          dir = Kstats::Node::Config['probes_dir']
 
           Dir[File.join(dir, "*.rb")].each do |probe_file|
             begin

data/lib/kstats/node/version.rb

@@ -1,5 +1,5 @@
 module Kstats
   module Node
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/kstats/node/worker.rb

@@ -9,7 +9,7 @@ module Kstats
         thread = Thread.new do
           begin
             begin
-              puts "New probe tick."
+              puts "***GATHERING INFORMATIONS #{`date`}."
               probes = Kstats::Node::Probe.reload_and_test!
 
               if insert_month == 0

data/test/conf.yml

@@ -1,2 +1,8 @@
 probes_dir: test/probes
-db_dir: test/db/test.sqlite3
+db_dir: test/db/test.sqlite3
+server:
+  port: 1234
+  bind: 0.0.0.0
+probes:
+  pgsql:
+    host: localhost

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstats-node
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: