Commit baf58076 authored by Vincent Pelletier's avatar Vincent Pelletier

Move "connected to a primary master node" log from handler to app for consistency.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@745 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent cea93513
...@@ -404,6 +404,7 @@ class Application(object): ...@@ -404,6 +404,7 @@ class Application(object):
connected = self.primary_master_node is not None \ connected = self.primary_master_node is not None \
and self.primary_master_node is self.trying_master_node and self.primary_master_node is self.trying_master_node
logging.info('connected to a primary master node')
# Identify to primary master and request initial data # Identify to primary master and request initial data
conn.lock() conn.lock()
try: try:
......
...@@ -180,10 +180,7 @@ class PrimaryBootstrapHandler(BaseHandler): ...@@ -180,10 +180,7 @@ class PrimaryBootstrapHandler(BaseHandler):
'Ignoring.' % dump(primary_uuid)) 'Ignoring.' % dump(primary_uuid))
else: else:
app.primary_master_node = primary_node app.primary_master_node = primary_node
if app.trying_master_node is primary_node: if app.trying_master_node is not primary_node:
# I am connected to the right one.
logging.info('connected to a primary master node')
else:
app.trying_master_node = None app.trying_master_node = None
conn.close() conn.close()
else: else:
......
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