Commit 35b7c286 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Import ProtocolError directly.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1744 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent f8a85256
...@@ -19,7 +19,7 @@ from neo import logging ...@@ -19,7 +19,7 @@ from neo import logging
from neo import protocol from neo import protocol
from neo.master.handlers import MasterHandler from neo.master.handlers import MasterHandler
from neo.protocol import ClusterStates, NodeStates, Packets from neo.protocol import ClusterStates, NodeStates, Packets, ProtocolError
from neo.util import dump from neo.util import dump
class AdministrationHandler(MasterHandler): class AdministrationHandler(MasterHandler):
...@@ -53,7 +53,7 @@ class AdministrationHandler(MasterHandler): ...@@ -53,7 +53,7 @@ class AdministrationHandler(MasterHandler):
app = self.app app = self.app
node = app.nm.getByUUID(uuid) node = app.nm.getByUUID(uuid)
if node is None: if node is None:
raise protocol.ProtocolError('unknown node') raise ProtocolError('unknown node')
if uuid == app.uuid: if uuid == app.uuid:
node.setState(state) node.setState(state)
...@@ -77,7 +77,7 @@ class AdministrationHandler(MasterHandler): ...@@ -77,7 +77,7 @@ class AdministrationHandler(MasterHandler):
break break
else: else:
# no connection to the node # no connection to the node
raise protocol.ProtocolError('no connection to the node') raise ProtocolError('no connection to the node')
node.setState(state) node.setState(state)
elif state == NodeStates.DOWN and node.isStorage(): elif state == NodeStates.DOWN and node.isStorage():
......
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