fixed the syntax error mess in pull request #537

PLEASE - do not submit code which is full of obvious syntax errors PLEASE - do not accept pull requests which are full of syntax errors
shinken-solutions · Dec 27, 2012 · ed6d342 · ed6d342
1 parent a9c15ee
commit ed6d342
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/shinken/modules/host_perfdata_broker/__init__.py b/shinken/modules/host_perfdata_broker/__init__.py
@@ -33,13 +33,13 @@
 
 # called by the plugin manager to get a broker
 def get_instance(plugin):
-    logger.info("[Host Perfdata Broker] Get a Host Perfdata broker for plugin %s" % plugin.get_name()
+    logger.info("[Host Perfdata Broker] Get a Host Perfdata broker for plugin %s" % plugin.get_name())
 
     # First try to import
     try:
         from host_perfdata_broker import Host_perfdata_broker
     except ImportError, exp:
-        logger.warning("[Host Perfdata Broker] Warning: the plugin type %s is unavailable: %s" % ('host_perfdata', exp)
+        logger.warning("[Host Perfdata Broker] Warning: the plugin type %s is unavailable: %s" % ('host_perfdata', exp))
         return None
 
     # Catch errors

diff --git a/shinken/modules/hot_dependencies_arbiter.py b/shinken/modules/hot_dependencies_arbiter.py
@@ -101,7 +101,7 @@ def _is_mapping_file_changed(self):
                 self.last_update = last_update
                 return True
         except OSError, exp:  # Maybe the file got problem, we bypaass here
-            logger.error("[Hot dependencies] Error: %s" str(exp))
+            logger.error("[Hot dependencies] Error: %s" % str(exp))
         return False
 
     # Read the mapping file and update our internal mappings
@@ -245,7 +245,6 @@ def hook_tick(self, arb):
                     logger.debug("[Hot dependencies] not find dumbass!")
                     continue
                 logger.info("[Hot dependencies] Linked son : %s and its father: %s" % (son_name, father_name))
-                if son_type == 'host' and father_type == 'host':
                 if son_type == 'host' and father_type == 'host':
                     # We just raise the external command, arbiter will do the job
                     # to dispatch them

diff --git a/shinken/modules/ip_tag_arbiter/ip_tag_arbiter.py b/shinken/modules/ip_tag_arbiter/ip_tag_arbiter.py
@@ -61,7 +61,7 @@ def hook_early_configuration(self, arb):
             else:
                 addr = h.address
 
-            logger.info("[IP Tag] Looking for h" % h.get_name())
+            logger.info("[IP Tag] Looking for %s" % h.get_name())
             logger.info("[IP Tag] Address is %s" % str(addr))
             h_ip = None
             try: