[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[olivierHa]

The following commit has been merged in the debian/master branch:
commit ae3ff3645f43222d2d59bc67f01022754c7b3e48
Author: olivierHa <olivier.hanesse at gmail.com>
Date:   Mon Dec 5 08:54:56 2011 +0100

    Fix: Default scheduling time for host

diff --git a/shinken/objects/schedulingitem.py b/shinken/objects/schedulingitem.py
index d9db370..bfa595f 100644
--- a/shinken/objects/schedulingitem.py
+++ b/shinken/objects/schedulingitem.py
@@ -486,13 +486,13 @@ class SchedulingItem(Item):
         if (not self.active_checks_enabled or not cls.execute_checks) and not force:
             return None
 
-        # If the check_interval is 0, we should not add it for a service
-        # but suppoe a 5min sched for hosts
+        # If check_interval is 0, we should not add it for a service
+        # but suppose a 5min sched for hosts
         if self.check_interval == 0 and not force:
             if cls.my_type == 'service':
                 return None
             else: # host
-                self.check_interval = 5
+                self.check_interval = 300 / cls.interval_length
 
         # Interval change is in a HARD state or not
         # If the retry is 0, take the normal value

-- 
UNNAMED PROJECT