Fix : Some default value in properties

shinken-solutions · Jan 5, 2015 · d07e86d · d07e86d
1 parent bd1118c
commit d07e86d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/shinken/commandcall.py b/shinken/commandcall.py
@@ -56,9 +56,9 @@ class CommandCall(DummyCommandCall):
         'module_type':     StringProp(default='fork'),
         'valid':           BoolProp(default=False),
         'args':            StringProp(default=[]),
-        'timeout':         IntegerProp(default='-1'),
+        'timeout':         IntegerProp(default=-1),
         'late_relink_done':BoolProp(default=False),
-        'enable_environment_macros': BoolProp(default=0),
+        'enable_environment_macros': BoolProp(default=False),
     }
 
     def __init__(self, commands, call, poller_tag='None',

diff --git a/shinken/daemon.py b/shinken/daemon.py
@@ -224,7 +224,7 @@ class Daemon(object):
         'idontcareaboutsecurity': BoolProp(default=False),
         'daemon_enabled':BoolProp(default=True),
         'spare':         BoolProp(default=False),
-        'max_queue_size': IntegerProp(default='0'),
+        'max_queue_size': IntegerProp(default=0),
         'daemon_thread_pool_size': IntegerProp(default=8),
         'http_backend':  StringProp(default='auto'),
     }

diff --git a/shinken/daemons/brokerdaemon.py b/shinken/daemons/brokerdaemon.py
@@ -70,7 +70,7 @@ class Broker(BaseSatellite):
     properties = BaseSatellite.properties.copy()
     properties.update({
         'pidfile':   PathProp(default='brokerd.pid'),
-        'port':      IntegerProp(default='7772'),
+        'port':      IntegerProp(default=7772),
         'local_log': PathProp(default='brokerd.log'),
     })
 

diff --git a/shinken/daemons/reactionnerdaemon.py b/shinken/daemons/reactionnerdaemon.py
@@ -49,7 +49,7 @@ class Reactionner(Satellite):
     properties = Satellite.properties.copy()
     properties.update({
         'pidfile':   PathProp(default='reactionnerd.pid'),
-        'port':      IntegerProp(default='7769'),
+        'port':      IntegerProp(default=7769),
         'local_log': PathProp(default='reactionnerd.log'),
     })
 

diff --git a/shinken/daemons/receiverdaemon.py b/shinken/daemons/receiverdaemon.py
@@ -74,7 +74,7 @@ class Receiver(Satellite):
     properties = Satellite.properties.copy()
     properties.update({
         'pidfile':   PathProp(default='receiverd.pid'),
-        'port':      IntegerProp(default='7773'),
+        'port':      IntegerProp(default=7773),
         'local_log': PathProp(default='receiverd.log'),
     })
 

diff --git a/shinken/notification.py b/shinken/notification.py
@@ -75,7 +75,7 @@ class Notification(Action):
         'worker':              StringProp(default='none'),
         'reactionner_tag':     StringProp(default='None'),
         'creation_time':       IntegerProp(default=0),
-        'enable_environment_macros': BoolProp(default=0),
+        'enable_environment_macros': BoolProp(default=False),
         # Keep a list of currently active escalations
         'already_start_escalations':  StringProp(default=set()),
 

diff --git a/shinken/satellitelink.py b/shinken/satellitelink.py
@@ -51,8 +51,8 @@ class SatelliteLink(Item):
         'check_interval':  IntegerProp(default=60, fill_brok=['full_status']),
         'max_check_attempts': IntegerProp(default=3, fill_brok=['full_status']),
         'spare':              BoolProp(default=False, fill_brok=['full_status']),
-        'manage_sub_realms':  BoolProp(default=1, fill_brok=['full_status']),
-        'manage_arbiters':    BoolProp(default=0, fill_brok=['full_status'], to_send=True),
+        'manage_sub_realms':  BoolProp(default=True, fill_brok=['full_status']),
+        'manage_arbiters':    BoolProp(default=False, fill_brok=['full_status'], to_send=True),
         'modules':            ListProp(default=[''], to_send=True, split_on_coma=True),
         'polling_interval':   IntegerProp(default=1, fill_brok=['full_status'], to_send=True),
         'use_timezone':       StringProp(default='NOTSET', to_send=True),