nagira 0.2.5 → 0.2.6

data/History.md

@@ -1,3 +1,7 @@
+### v.0.2.6
+* Tue Mar 26 2013 -- Ivan Gusev
+
+  - Fix for long time parsing https://github.com/dmytro/nagira/issues/20
 ### v.0.2.5
 
 * Fri Mar 15 2013 -- Dmytro Kovalov

data/lib/app.rb

@@ -77,6 +77,15 @@ class Nagira < Sinatra::Base
                                                             )
                   })
 
+    $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]
+
     puts "[#{Time.now}] -- Starting Nagira application"
     puts "[#{Time.now}] -- Version #{Nagira::VERSION}"
     puts "[#{Time.now}] -- Running in #{Nagira.settings.environment} environment"
@@ -123,14 +132,18 @@ class Nagira < Sinatra::Base
         $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
 
-    @status   = $nagios[:status].status['hosts']
-    @objects  = $nagios[:objects].objects
 
 ##
 # TODO: This stuff breaks XML valid. Will have to wait.

data/lib/nagira/background_parse.rb

@@ -14,11 +14,14 @@ module Nagios
     #
     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 {
-            $nagios[:status].parse
+            $use_inflight_status ? $nagios[:status].parse : $nagios[:status_inflight].parse
+            $use_inflight_status = !$use_inflight_status
             sleep interval
           } #loop
         } # thread

data/version.txt

@@ -1 +1 @@
-0.2.5
+0.2.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel