Permalink
Browse files

fix: try to fix #1170 by removing Harakiri on teh reactionners and c…

…hange the SyncManager communication from named pipe to real tcp sockets on localhost.
  • Loading branch information...
naparuba committed Apr 8, 2014
1 parent 2067fc1 commit d001d1f6fa7e5dcdb2cbb5590c9e341c49ee95e4
Showing with 2 additions and 7 deletions.
  1. +1 −1 setup.py
  2. +1 −1 shinken/daemon.py
  3. +0 −5 shinken/worker.py
View
@@ -263,7 +263,7 @@ def _error (msg):
data_files = []
elif 'linux' in sys.platform or 'sunos5' in sys.platform:
default_paths = {
- 'bin': install_scripts or "/usr/bin/",
+ 'bin': install_scripts or "/usr/bin",
'var': "/var/lib/shinken/",
'share': "/var/lib/shinken/share",
'etc': "/etc/shinken",
View
@@ -596,7 +596,7 @@ def do_daemon_init_and_start(self, use_pyro=True):
else:
# The Manager is a sub-process, so we must be sure it won't have
# a socket of your http server alive
- self.manager = SyncManager()
+ self.manager = SyncManager(('127.0.0.1',0))
def close_http_daemon(daemon):
try:
# Be sure to release the lock so there won't be lock in shutdown phase
View
@@ -281,11 +281,6 @@ def do_work(self, s, returns_queue, c):
except:
pass
- if self._mortal == True and self._idletime > 2 * self._timeout:
- logger.warning("[%d] Timeout, Harakiri" % self.id)
- # The master must be dead and we are lonely, we must die
- break
-
# Look if we are dying, and if we finish all current checks
# if so, we really die, our master poller will launch a new
# worker because we were too weak to manage our job :(

0 comments on commit d001d1f

Please sign in to comment.