Fix
This commit is contained in:
1 parent
e5ebdd59c9
commit
12a4685f99
2 files changed
+9
-6
No files matched your search
@@ -6,9 +6,10 @@ from colony.core.logger.logging import get_logger
|
|||||||
|
|
||||||
|
|
||||||
class RoleManager:
|
class RoleManager:
|
||||||
def __init__(self, network, role_registry):
|
def __init__(self, network, role_registry, state_manager: StateManager):
|
||||||
self.network = network
|
self.network = network
|
||||||
self.role_registry = role_registry
|
self.role_registry = role_registry
|
||||||
|
self.state_manager = state_manager
|
||||||
|
|
||||||
self.logger = get_logger(self.__class__.__name__)
|
self.logger = get_logger(self.__class__.__name__)
|
||||||
|
|
||||||
@@ -17,7 +18,7 @@ class RoleManager:
|
|||||||
context = RoleContext(self.network, self)
|
context = RoleContext(self.network, self)
|
||||||
|
|
||||||
roles = {}
|
roles = {}
|
||||||
for role_name in StateManager().get(StateManager.Data.Roles):
|
for role_name in self.state_manager.get(StateManager.Data.Roles):
|
||||||
role_cls = self.role_registry.get_role_class_by_name(role_name)
|
role_cls = self.role_registry.get_role_class_by_name(role_name)
|
||||||
self.logger.debug(f"Creating instance of role {role_name}. ")
|
self.logger.debug(f"Creating instance of role {role_name}. ")
|
||||||
role_instance = role_cls(context=context)
|
role_instance = role_cls(context=context)
|
||||||
@@ -55,7 +56,7 @@ class RoleManager:
|
|||||||
role_cls = self.role_registry.get_role_class_by_name(role_name)
|
role_cls = self.role_registry.get_role_class_by_name(role_name)
|
||||||
current_roles[role_name] = role_cls(context=context)
|
current_roles[role_name] = role_cls(context=context)
|
||||||
|
|
||||||
StateManager().set(StateManager.Data.Roles, list(current_roles.keys()))
|
self.state_manager.set(StateManager.Data.Roles, list(current_roles.keys()))
|
||||||
|
|
||||||
self.network.self_node.roles = list(current_roles.keys())
|
self.network.self_node.roles = list(current_roles.keys())
|
||||||
self.network.self_node.set_role_instances(current_roles)
|
self.network.self_node.set_role_instances(current_roles)
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ from colony.core.network.core import Network
|
|||||||
from colony.core.dispatcher import Dispatcher
|
from colony.core.dispatcher import Dispatcher
|
||||||
from colony.core.roles.manager import RoleManager
|
from colony.core.roles.manager import RoleManager
|
||||||
from colony.core.state_manager import StateManager
|
from colony.core.state_manager import StateManager
|
||||||
from colony.core.storage import DefaultStorage
|
|
||||||
from colony.role_registry import RoleRegistry
|
from colony.role_registry import RoleRegistry
|
||||||
from colony.transport.discover import Discover
|
from colony.transport.discover import Discover
|
||||||
from colony.transport.listener import Listener
|
from colony.transport.listener import Listener
|
||||||
@@ -13,12 +12,15 @@ from colony.settings import configuration
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
storage = DefaultStorage()
|
|
||||||
state_manager = StateManager()
|
state_manager = StateManager()
|
||||||
network = Network()
|
network = Network()
|
||||||
role_registry = RoleRegistry(role_list=available_roles)
|
role_registry = RoleRegistry(role_list=available_roles)
|
||||||
dispatcher = Dispatcher(network=network, role_registry=role_registry)
|
dispatcher = Dispatcher(network=network, role_registry=role_registry)
|
||||||
role_manager = RoleManager(network=network, role_registry=role_registry)
|
role_manager = RoleManager(
|
||||||
|
network=network,
|
||||||
|
role_registry=role_registry,
|
||||||
|
state_manager=state_manager,
|
||||||
|
)
|
||||||
|
|
||||||
threads = []
|
threads = []
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user