nagira 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9596abd9430f05e653fafca586fd282b8cf44d61
-  data.tar.gz: a9a614392506731afc58b58b8bb0edd8af565379
+  metadata.gz: 2ba8c40871546f2f94e517df75a4041fc2e439c0
+  data.tar.gz: 609ac720f528e5d0a5d6a74eaf9d85ff9d215c4d
 SHA512:
-  metadata.gz: 958f5ebadc0ea90b3c6d003ef58b0cf7cb90edeab43d9a9b54503493452e29c5574ce470b3edbad426d8db4d25407818454e19f4d657fde09ac4b76cbff6b985
-  data.tar.gz: e39c5fdb6f4be248c2e1343d562f3bebb1afa4df66046e11b06ba9eac594f26cfb59fa79efd3e1e1411e2ae54d0e13cbf19f568bf1d8e922e6f27dfead247734
+  metadata.gz: e34c0161e542e366e1a3d0f83f53938c2a4d914c3a8aa8b81ac1503e21930374bee6f20901dafe59ea4cb20a017cd8865b7d7734a2f152135ef88899f544aaf8
+  data.tar.gz: c90991ee5002abc1d42625385765fc3acadb521027f1bf6cabe976cf1f9422f344eeeb2389159a5c5e183625564ab3a8485dd372b449bc31be5f3c88df06e7e0

data/History.md

@@ -1,3 +1,6 @@
+### v0.5.1
+* Thr Dec 17 2015 -- Dmytro Kovalov
+  - Refactored parsing of Nagios files, cleaner code. No functionality changes.
 ### v0.5.0
 * Fri Nov 6 2015 -- Dmytro Kovalov
   - Add support for Service groups, new route `GET /_status/_servicegroup/`

data/app/app.rb

@@ -53,6 +53,7 @@ require 'nagira'
 class Nagira < Sinatra::Base
   set :app_file, __FILE__
 
+
   ##
   # Do some necessary tasks at start and then run Sinatra app.
   #
@@ -60,45 +61,23 @@ class Nagira < Sinatra::Base
   # @overload before("Initial Config")
   configure do
 
-    $nagios = {  }
-    $nagios[:config]  = Nagios::Config.new Nagira.settings.nagios_cfg
-    $nagios[:config].parse
+    Parser.config   = settings.nagios_cfg
+    Parser.status   = settings.status_cfg   || Parser.config.status_file
+    Parser.objects  = settings.objects_cfg  || Parser.config.object_cache_file
+    Parser.commands = settings.command_file || Parser.config.command_file
 
-    $nagios.merge!({
-                    status: Nagios::Status.new(  Nagira.settings.status_cfg ||
-                                                 $nagios[:config].status_file
-                                                 ),
-                    objects: Nagios::Objects.new( Nagira.settings.objects_cfg ||
-                                                  $nagios[:config].object_cache_file
-                                                  ),
-                    commands: Nagios::ExternalCommands.new( Nagira.settings.command_file ||
-                                                            $nagios[:config].command_file
-                                                            )
-                  })
+    BackgroundParser.ttl    = ::DEFAULT[:ttl].to_i
+    BackgroundParser.start  = ::DEFAULT[:start_background_parser]
 
-    $nagios.merge!({
-                    status_inflight: Nagios::Status.new( Nagira.settings.status_cfg ||
-                                                         $nagios[:config].status_file
-                                                         ),
-                    objects_inflight: Nagios::Objects.new( Nagira.settings.objects_cfg ||
-                                                           $nagios[:config].object_cache_file
-                                                         )
-                  }) if ::DEFAULT[:start_background_parser]
+    Logger.log "Starting Nagira application"
+    Logger.log "Version #{Nagira::VERSION}"
+    Logger.log "Running in #{Nagira.settings.environment} environment"
 
-    puts "[#{Time.now}] -- Starting Nagira application"
-    puts "[#{Time.now}] -- Version #{Nagira::VERSION}"
-    puts "[#{Time.now}] -- Running in #{Nagira.settings.environment} environment"
-    $nagios.keys.each do |x|
-      puts "[#{Time.now}] -- Using nagios #{x} file: #{$nagios[x].path}"
+    Parser.state.to_h.keys.each do |x|
+      Logger.log "Using nagios #{x} file: #{Parser.state[x].path}"
     end
 
-    $nagios[:status].parse
-    $nagios[:objects].parse
-
-    @status   = $nagios[:status].status['hosts']
-    @objects  = $nagios[:objects].objects
-
-    Nagios::BackgroundParser.new
+    BackgroundParser.run if BackgroundParser.configured?
   end
 
 
@@ -121,44 +100,21 @@ class Nagira < Sinatra::Base
   #
   # @method   parse_nagios_files
   # @overload before("Parse Nagios files")
-
   before do
+    Logger.log("BackgroundParser is not running", :warning) if
+      BackgroundParser.configured? && BackgroundParser.dead?
 
-    if Nagira.settings.start_background_parser
-      unless $bg.alive?
-        logger.warn "Background Parser is configured to run, but is not active"
-        $nagios[:config].parse
-        $nagios[:status].parse
-        $nagios[:objects].parse
-      end
-      $use_inflight_status  ? @status = $nagios[:status_inflight].status['hosts']
-                            : @status = $nagios[:status].status['hosts']
-      $use_inflight_objects ? @objects  = $nagios[:objects_inflight].objects
-                            : @objects  = $nagios[:objects].objects
-    else
-      $nagios[:config].parse
-      $nagios[:status].parse
-      $nagios[:objects].parse
-      @status   = $nagios[:status].status['hosts']
-      @objects  = $nagios[:objects].objects
-    end
+    Parser.parse
 
+    @status = Parser.status['hosts']
+    @objects = Parser.objects
 
-##
-# TODO: This stuff breaks XML valid. Will have to wait.
-#
-#     idx = 0
-#     @status.keys.uniq.each do |hostname|
-#       @status[idx] = @status[hostname]
-#       idx += 1
-#     end
     #
     # Add plural keys to use ActiveResource with Nagira
     #
     @objects.keys.each do |singular|
       @objects[singular.to_s.pluralize.to_sym] = @objects[singular]
     end
-
   end
 
   ##
@@ -191,18 +147,22 @@ class Nagira < Sinatra::Base
   #     GET /_objects.json         # => :json
   #     GET /_status/_list.yaml    # => :yaml
   #
- before do
+  before do
     request.path_info.sub!(/#{settings.format_extensions}/, '')
     @format = ($1 || settings.format).to_sym
     content_type "application/#{@format.to_s}"
   end
 
+  ##
+  # @method   detect_ar_type
+  # @overload before('detect ActiveResource mode')
+  #
+  # Detect if this a request for ActiveResource PATH
+  #
   before do
-    request.path_info.sub!(/^(#{Nagira::AR_PREFIX})\//, '/')
-    @active_resource = $1 ? true : false
+    @active_resource = request.path_info =~ %r{^#{Nagira::AR_PREFIX}/}
   end
 
-
   ##
   # @method   strip_output_type
   # @overload before('detect output mode')
@@ -253,7 +213,6 @@ class Nagira < Sinatra::Base
     end
   end
 
-
   ##
   # @method   object_not_found
   # @overload after("Object not found or bad request")
@@ -273,7 +232,6 @@ class Nagira < Sinatra::Base
     end
   end
 
-
   ##
   # @method argument_error
   # @overload after("ArgumentError")
@@ -285,7 +243,6 @@ class Nagira < Sinatra::Base
     halt [400, @data.send("to_#{@format}") ] if ! @data[:result]
   end
 
-
   ##
   # @method   convert_to_active_resource
   # @overload after("Return Array for ActiveResouce routes")
@@ -314,9 +271,6 @@ class Nagira < Sinatra::Base
     body( @callback ? "#{@callback.to_s} (#{@data.to_json})" : @data.send("to_#{@format}") )
   end
 
-
-
-
   ##
   # @method get_api
   # @overload get(/_api)
@@ -328,7 +282,6 @@ class Nagira < Sinatra::Base
     nil
   end
 
-
   ##
   # @method get_runtime_config
   # @overload get(/_runtime)
@@ -342,7 +295,7 @@ class Nagira < Sinatra::Base
         environment: Nagira.settings.environment,
         home: ENV['HOME'],
         user: ENV['LOGNAME'],
-        nagiosFiles: $nagios.keys.map {  |x| {  x =>  $nagios[x].path }}
+        nagiosFiles: $nagios.to_h.keys.map {  |x| {  x =>  $nagios[x].path }}
       }
     }
     nil
@@ -366,7 +319,6 @@ class Nagira < Sinatra::Base
   # get "/:resource" do |resource|
   #   respond_with $nagios.status[resource], @format
   # end
-
 end
 
 require "app/put/status"

data/app/get/config.rb

@@ -18,7 +18,7 @@ class Nagira < Sinatra::Base
   # Get Nagios configuration hash form parsing main Nagios
   # configuration file nagios.cfg
   get "/_config" do
-    @data = $nagios[:config].configuration
+    @data = Parser.config.configuration
     nil
   end
 end

data/app/put.rb

@@ -2,12 +2,12 @@ class Nagira < Sinatra::Base
 
   # @method parse_input_data
   # @overload before("Parse PUT request body")
-  # 
+  #
   # Process the data before on each HTTP request.
   #
-  # @return [Array] @input Sets @input instance variable. 
+  # @return [Array] @input Sets @input instance variable.
   #
-  before do 
+  before do
     if request.put?
       data = request.body.read
       @input = case @format
@@ -22,16 +22,16 @@ class Nagira < Sinatra::Base
   end
 
   # Define helpers for put methods
-  helpers do 
+  helpers do
 
     # Helper to send PUT update to Nagios::ExternalCommands
     #
-    # @param [Hash] params 
+    # @param [Hash] params
     # @param [Symbol] action Nagios external command name
     #
-    # FIXME: This only accepts single service. Modify to use Arrays too 
+    # FIXME: This only accepts single service. Modify to use Arrays too
     def put_update action, params
-      res = $nagios[:commands].write(params.merge({ :action => action }))
+      res = Parser.commands.write(params.merge({ :action => action }))
       { :result => res[:result], :object => res[:data]}
     end
   end
@@ -49,5 +49,5 @@ class Nagira < Sinatra::Base
     def update_host_status params
       put_update :PROCESS_HOST_CHECK_RESULT, params
     end
-  
+
 end

data/config/defaults.rb

@@ -9,7 +9,6 @@
 # Exception is ::DEFAULT[:ttl] which is not overriden by environment.rb
 # and should be changed here.
 
-
 DEFAULT = {
 
   format_extensions: '\.(json|yaml|xml)$', #  Regex for available
@@ -41,7 +40,7 @@ DEFAULT = {
   # this number of seconds. To disable timed parsing, set
   # ttl to 0 or negative number.
 
-  ttl: ENV['NAGIRA_TTL'].to_i || 5,
+  ttl: (ENV['NAGIRA_TTL'] && ENV['NAGIRA_TTL'].to_i) || 5,
 
   ##
   # start_background_parser used in Nagios::BackgroundParse class.
@@ -53,7 +52,7 @@ DEFAULT = {
   # intervals slightly shorter than `ttl` to ensure that data are
   # always updated. So, `ttl` should be larger than 1.
   #
-  start_background_parser: (ENV['NAGIRA_BG_PARSING'] == '1'),
+  start_background_parser: (ENV['NAGIRA_BG_PARSING'] != '0'),
 
   ##
   # By default hostname regular expression accepts alpha-numerics,
@@ -91,5 +90,4 @@ configure do
   end
 end
 
-
 end

data/config/environment.rb

@@ -1,5 +1,7 @@
+require 'pry'
 class Nagira < Sinatra::Base
 
+
   disable :protection
   enable :logging
 
@@ -33,7 +35,6 @@ class Nagira < Sinatra::Base
     set :show_exceptions, false
   end
 
-
 # configure :production do
 #   # If your nagios.cfg file is in 'standard' location (in RH and
 #   # Debian it usially installed under /etc/nagios(3)?) you don't need

data/lib/nagira.rb

@@ -9,6 +9,7 @@ require 'json'
 require 'yaml'
 require 'sinatra'
 require 'sinatra/reloader'
+require 'singleton'
 
 $: << File.dirname(__FILE__) << File.dirname(File.dirname(__FILE__))
 
@@ -22,6 +23,11 @@ require "nagira/hostgroup"
 require "nagira/servicegroup"
 require "nagira/hostservice"
 
+require "nagira/background_parse"
+require "nagira/parser"
+require "nagira/simple_logger"
+
+
 #
 # environment file must go after default, some settings override
 # defaults.

data/lib/nagira/background_parse.rb

@@ -1,31 +1,123 @@
-require 'nagios'
-
-module Nagios
+class Nagira < Sinatra::Base
   ##
   # Background parsing of status.dat file in separate thread. Runs on
-  # regular intervals slightly shorter than :ttl
+  # regular intervals defined by :ttl
   #
   class BackgroundParser
+    include Singleton
 
-    ##
-    # 
-    # If :ttl is not defined set to 0 and do not run
-    # background parsing.
-    #
     def initialize
-      interval = [::DEFAULT[:ttl],1].max || nil
-      $use_inflight_status = false
-      $use_inflight_objects = false
-      if interval && ::DEFAULT[:start_background_parser]
-        puts "[#{Time.now}] Starting background parser thread with interval #{interval} sec"
-        $bg = Thread.new {
-          loop {
-            $use_inflight_status ? $nagios[:status].parse : $nagios[:status_inflight].parse
-            $use_inflight_status = !$use_inflight_status
-            sleep interval
-          } #loop
-        } # thread
+      @use_inflight_flag = false
+    end
+
+    #  For large Nagios files there's a significant time required for
+    #  the parsing, if HTTP request comes during the parsing, data
+    #  could be missing. To prevent this from happening flag variable
+    #  defines two sets of the parsed data, which are parsed at
+    #  different sequential runs of the parser.
+    attr_accessor :use_inflight_flag
+
+    class << self
+
+      ##
+      # Target data structure (i.e. $nagios hash for example) which is
+      # updated by BackgroundParser.
+      #
+      def target
+        @target ||= Parser.state
+      end
+
+      ##
+      # \@ttl (Fixint, seconds) defines re-parsing interval for the
+      # BackgroundParser.
+      #
+      # Set @@ttl after initialization, to be able to pass
+      #  configuration variables.
+      #
+      # @see start=
+      #
+      # Example:
+      #     Nagios::BackgroundParser.ttl = ::DEFAULT[:ttl].to_i
+      #     Nagios::BackgroundParser.start = ::DEFAULT[:start_background_parser]
+      #     Nagios::BackgroundParser.run
+      #
+      def ttl= ttl
+        @ttl = ttl
       end
+
+      ##
+      # \@start (Boolean) defines whether BackgroundParser should be
+      # started.
+      #
+      # Set :start variable after initialization, to be able to pass
+      #  configuration values.
+      #
+      # @see ttl=
+      #
+      # Example:
+      #     Nagios::BackgroundParser.ttl = ::DEFAULT[:ttl].to_i
+      #     Nagios::BackgroundParser.start = ::DEFAULT[:start_background_parser]
+      #     Nagios::BackgroundParser.run
+      #
+      def start= start
+        @start = start
+      end
+
+      ##
+      # Is BackgroundParser configured to run?
+      def configured?
+        @ttl > 0 && @start
+      end
+
+      ##
+      # Is BG parser thread running
+      #
+      def alive?
+        !@bg.nil? && @bg.alive?
+      end
+
+      ##
+      # See alive?
+      def dead?
+        !alive?
+      end
+
+
+      ##
+      # Start BG Parser if it's configured to run and TTL is defined
+      def run
+        if configured? && dead?
+
+          Logger.log "Starting background parser thread with interval #{@ttl} sec"
+
+          target.status_inflight = Nagios::Status.new(target[:status].path)
+          target.objects_inflight = Nagios::Objects.new(target[:objects].path)
+
+          Parser.parse [:status_inflight,:objects_inflight]
+
+          @bg = Thread.new {
+            loop {
+              target[with_inflight?(:status)].parse
+              target[with_inflight?(:objects)].parse
+              sleep @ttl
+              @use_inflight_flag = !@use_inflight_flag
+            }
+          }
+        end
+      end
+
+      def inflight?
+        @use_inflight_flag
+      end
+      ##
+      # Construct file symbol, based on in flight status.
+      # @see run
+      def with_inflight?(file)
+        (inflight? ? "#{file}_inflight" : file).to_sym
+      end
+
     end
   end
 end
+
+#  LocalWords:  ttl BackgroundParser config param Fixint

data/lib/nagira/hostgroup.rb

@@ -4,8 +4,8 @@ class Nagira < Sinatra::Base
 
     def initialize(name)
       @name      = name
-      @objects   = $nagios[:objects].objects
-      @status    = $nagios[:status].status['hosts']
+      @objects   = Parser.objects
+      @status    = Parser.status['hosts']
       @hostgroup = @objects[:hostgroup][name]
       @data  = {  }
     end

data/lib/nagira/hostservice.rb

@@ -9,7 +9,7 @@ class Nagira < Sinatra::Base
 
     def status
       begin
-        $nagios[:status]
+        Parser
           .status['hosts'][hostname]['servicestatus'][servicename]
       rescue NoMethodError
         {  }

data/lib/nagira/nagios.rb

@@ -1,7 +1,6 @@
 module Nagios
 
   require 'nagira/timed_parse'
-  require 'nagira/background_parse'
 
   # Extensions to Nagios::Status and Objects classes for use with
   # Nagira: keep track of file modification times and parse only

data/lib/nagira/parser.rb

@@ -0,0 +1,110 @@
+class Nagira < Sinatra::Base
+  # Singleton class, that handles parsing of the Nagios data. This
+  # class uses another singleton class BackgroundParser for repeating
+  # parsing of the files in background thread.
+  #
+  # Example usage:
+  #
+  #    Parser.config   = < path to nagios.cfg file>
+  #    Parser.status   = < path to status.cfg file>
+  #    Parser.objects  = < path to object_cache file>
+  #    Parser.commands = < path to the external command execution file >
+  #
+  class Parser
+    include Singleton
+
+    def initialize
+      @state = OpenStruct.new
+    end
+
+    # State structure keep all the Nagios parsed state information for
+    # :objects, :status, :config, etc. as well as "inflight" data.
+    attr_accessor :state
+
+    class << self
+
+      # Detect which half of the data should be returned. There's a
+      # pissiblility that during request data are bing parsed, which
+      # can result in incomplete or broken data. This ensures, that
+      # only data that are not being parsed now returned.
+      def inflight?
+        BackgroundParser.inflight?
+      end
+
+      ##
+      # Construct file symbol, based on in flight status.
+      #
+      # @see inflight?
+      def with_inflight?(file)
+        (inflight? ? "#{file}_inflight" : file).to_sym
+      end
+
+      # Return state object
+      def state
+        instance.state
+      end
+
+      ##
+      # If BackgroundParser is not running, then parse files,
+      # otherwise do nothing, as the data are already parsed by the
+      # BG.
+      def parse(files = %i{config objects status})
+        return if BackgroundParser.alive?
+        files
+          .map { |f| state.send(f) }
+          .map(&:parse)
+      end
+
+      ##
+      # Configuration object of the Nagios and Nagira parser. Create
+      # new configuration and parse it at the time of creation.
+      #
+      def config=(config)
+        state.config = Nagios::Config.new(config)
+        state.config.parse
+      end
+
+      # Return parsed configuration.
+      def config
+        state.config
+      end
+
+      # Create new data structure for the host status data
+      #
+      # @param status_file [String] PATH to the file
+      def status=(status_file)
+        state.status = Nagios::Status.new(status_file)
+      end
+
+      # Return parsed hosts status. Depending on the inflight flag
+      # return either "A" or "B" set of data.
+      def status
+        state
+          .send(with_inflight?(:status))
+          .status
+      end
+
+      # Create new data structure for parsed object_cache file
+      # information.
+      #
+      # @param objects_file [String] PATH to the file
+      def objects=(objects_file)
+        state.objects = Nagios::Objects.new(objects_file)
+      end
+
+      def objects
+        state
+          .send(with_inflight?(:objects))
+          .objects
+      end
+
+      def commands=(commands_file)
+        state.commands = Nagios::ExternalCommands.new(commands_file)
+      end
+
+      def commands
+        state.commands
+      end
+    end
+  end
+end

data/lib/nagira/servicegroup.rb

@@ -33,7 +33,7 @@ class Nagira < Sinatra::Base
     attr_reader :name
 
     def objects
-      @objects ||= $nagios[:objects].objects
+      @objects ||= Parser.objects
     end
 
     def servicegroup

data/lib/nagira/simple_logger.rb

@@ -0,0 +1,11 @@
+class Nagira < Sinatra::Base
+  # Simple logger helper. Use as: Logger.log(message)
+  class Logger
+    include Singleton
+
+    # Print log message to stdout with optional warning tag
+    def self.log(message, warning=false)
+      puts "[#{Time.now}] -- #{ "WARNING:" if warning } #{message}"
+    end
+  end
+end

data/lib/nagira/timed_parse.rb

@@ -56,7 +56,7 @@ module Nagios
     end
 
     attr_accessor :last_parsed, :parse_interval
-      
+
     def last_changed
       @last_changed = File.mtime(@path)
     end
@@ -65,13 +65,13 @@ module Nagios
     def changed?
       self.last_changed > self.last_parsed
     end
-    
+
     # Check if:
     # - file changed?
     # - was it parsed recently?
     def need_parsing?
       changed? && ((Time.now - self.last_parsed) > @parse_interval)
     end
-    
+
   end
 end

data/lib/tasks/debug.rake

@@ -31,9 +31,9 @@ namespace :debug do
       #
       # These files from parsed config.
       #
-      files << $nagios[:config].path
-      files << $nagios[:status].path
-      files << $nagios[:objects].path
+      files << Parser.config.path
+      files << Parser.status.path
+      files << Parser.objects.path
 
       open("#{dir}/sherlock.txt", "w")    { |f| f.puts os_info }
       open("#{dir}/permissions.txt", "w") { |f| f.puts permissions }

data/spec/01_background_parser.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+
+describe "BackgroundParser" do
+
+  before {
+    Nagios::BackgroundParser.ttl = 1
+    Nagios::BackgroundParser.start = true
+  }
+
+  it "is configured" do
+    expect(Nagios::BackgroundParser).to be_configured
+  end
+
+  context "after start" do
+
+    before {
+      Nagios::BackgroundParser.run
+      sleep 0.1
+    }
+
+    it "is running" do
+      expect(Nagios::BackgroundParser).to be_alive
+    end
+
+  end
+end

data/spec/put/support.rb

@@ -42,9 +42,9 @@ end
 
 shared_examples_for :write_to_nagios_cmd_file do
   before (:all) do
-      File.delete $nagios[:commands].path rescue nil
+    File.delete ::Nagira::Parser.commands.path rescue nil
   end
-  let (:cmd) { $nagios[:commands].path }
+  let (:cmd) { ::Nagira::Parser.commands.path }
 
   it "writes to nagios.cmd file" do
     expect(File).to exist(cmd)
@@ -52,7 +52,7 @@ shared_examples_for :write_to_nagios_cmd_file do
   end
 
   after (:each) do
-      File.delete $nagios[:commands].path rescue nil
+      File.delete ::Nagira::Parser.commands.path rescue nil
   end
 end
 

data/version.txt

@@ -1 +1 @@
-0.5.0
+0.5.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dmytro Kovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -298,30 +298,38 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/nagira
 - History.md
 - Rakefile
-- version.txt
 - app/app.rb
 - app/get/config.rb
 - app/get/objects.rb
+- app/get/status.rb
 - app/get/status/hostgroups.rb
 - app/get/status/servicegroups.rb
-- app/get/status.rb
+- app/put.rb
 - app/put/host.rb
 - app/put/status.rb
-- app/put.rb
+- bin/nagira
+- bin/nagira-setup
+- config/defaults.rb
+- config/environment.rb
+- config/nagira.defaults
+- config/nagira.init_d
+- config/puma.rb
+- lib/nagira.rb
 - lib/nagira/background_parse.rb
 - lib/nagira/hostgroup.rb
 - lib/nagira/hostservice.rb
 - lib/nagira/nagios.rb
+- lib/nagira/parser.rb
 - lib/nagira/servicegroup.rb
+- lib/nagira/simple_logger.rb
 - lib/nagira/timed_parse.rb
-- lib/nagira.rb
 - lib/tasks/config.rake
 - lib/tasks/debug.rake
 - lib/tasks/doc.rake
 - spec/00_configuration_spec.rb
+- spec/01_background_parser.rb
 - spec/01_data_format/01_nagira_response_spec.rb
 - spec/01_data_format/02_0_status_spec.rb
 - spec/01_data_format/02_nagira_data_spec.rb
@@ -337,28 +345,23 @@ files:
 - spec/put/status_spec.rb
 - spec/put/support.rb
 - spec/spec_helper.rb
-- config/defaults.rb
-- config/environment.rb
-- config/nagira.defaults
-- config/nagira.init_d
-- config/puma.rb
 - test/benchmark.rb
+- test/data/bad/README
 - test/data/bad/nagios.cfg
 - test/data/bad/objects.cache
-- test/data/bad/README
 - test/data/bad/status.dat
 - test/data/json/GET.txt
+- test/data/json/README.txt
 - test/data/json/host_check.json
 - test/data/json/host_check.sh
 - test/data/json/ping.json
 - test/data/json/ping_and_http.json
 - test/data/json/ping_and_http_check.sh
 - test/data/json/ping_check.sh
-- test/data/json/README.txt
 - test/data/nagios.cfg
 - test/data/objects.cache
 - test/data/status.dat
-- bin/nagira-setup
+- version.txt
 homepage: http://dmytro.github.com/nagira
 licenses:
 - MIT
@@ -372,7 +375,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -380,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Nagira : Nagios RESTful API'