Commit bfd97ea5 authored by Vincent Pelletier's avatar Vincent Pelletier

Factorise calls to electPrimary.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1552 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 02311d51
...@@ -99,16 +99,17 @@ class Application(object): ...@@ -99,16 +99,17 @@ class Application(object):
def run(self): def run(self):
"""Make sure that the status is sane and start a loop.""" """Make sure that the status is sane and start a loop."""
bootstrap = True
# Make a listening port. # Make a listening port.
self.listening_conn = ListeningConnection(self.em, None, self.listening_conn = ListeningConnection(self.em, None,
addr = self.server, connector_handler = self.connector_handler) addr = self.server, connector_handler = self.connector_handler)
# Start the election of a primary master node.
self.electPrimary()
# Start a normal operation. # Start a normal operation.
while True: while True:
# (Re)elect a new primary master.
self.electPrimary(bootstrap=bootstrap)
bootstrap = False
try: try:
if self.primary: if self.primary:
self.playPrimaryRole() self.playPrimaryRole()
...@@ -119,8 +120,6 @@ class Application(object): ...@@ -119,8 +120,6 @@ class Application(object):
# Forget all connections. # Forget all connections.
for conn in self.em.getClientList(): for conn in self.em.getClientList():
conn.close() conn.close()
# Reelect a new primary master.
self.electPrimary(bootstrap = False)
def electPrimary(self, bootstrap = True): def electPrimary(self, bootstrap = True):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment