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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 1a17a6058f694cba5da2da01d4691be6d956fd0f
Author: Naparuba <naparuba at gmail.com>
Date:   Thu Dec 29 13:17:07 2011 +0100

    Add : (reported by : foobar1111) arbiter match only hostname, and not fqdn. Now it try fqdn, and then hostname.

diff --git a/THANKS b/THANKS
index 6f1330a..4915436 100644
--- a/THANKS
+++ b/THANKS
@@ -50,4 +50,6 @@ To grim for his bug report about disabling flapping options
 To peter woodman for his bug report about timezone override crash
 To Laurent Ollagnier for his bug report and patch about notification commands
 To sprudhomme for his feature request about long_output in Centreon/Ndo
-To Gabor Varga for his patch about the "sc" command for windowns setup :)
\ No newline at end of file
+To Gabor Varga for his patch about the "sc" command for windowns setup :)
+To foobar1111 for his ask about fqdn and arbiter matching for hostname
+To twellspring for hs bug report about escalation and templates
\ No newline at end of file
diff --git a/shinken/arbiterlink.py b/shinken/arbiterlink.py
index c8d0f24..be57d9c 100644
--- a/shinken/arbiterlink.py
+++ b/shinken/arbiterlink.py
@@ -60,9 +60,10 @@ class ArbiterLink(SatelliteLink):
         return state
 
 
+    # Look for ourself as an arbiter. Should be our fqdn name, or if not, our hostname one
     def is_me(self):
-        logger.log("And arbiter is launched with the hostname:%s from an arbiter point of view of addr :%s" % (self.host_name, socket.gethostname()), print_it=False)
-        return self.host_name == socket.gethostname()
+        logger.log("And arbiter is launched with the hostname:%s from an arbiter point of view of addr :%s" % (self.host_name, socket.getfqdn()), print_it=False)
+        return self.host_name == socket.getfqdn() or self.host_name == socket.gethostname()
 
 
     def give_satellite_cfg(self):

-- 
UNNAMED PROJECT