All sorts of out-comments to get the lonely thing kickin'.

pull/2140/head
jMyles 2020-06-23 02:20:18 -07:00
parent b491a613a1
commit 65607953dc
3 changed files with 27 additions and 19 deletions

View File

@ -1180,10 +1180,10 @@ class Ursula(Teacher, Character, Worker):
if emitter: if emitter:
emitter.message(f"✓ Database pruning", color='green') emitter.message(f"✓ Database pruning", color='green')
if learning: # if learning:
self.start_learning_loop(now=self._start_learning_now) # self.start_learning_loop(now=self._start_learning_now)
if emitter: # if emitter:
emitter.message(f"✓ Node Discovery ({','.join(self.learning_domains)})", color='green') # emitter.message(f"✓ Node Discovery ({','.join(self.learning_domains)})", color='green')
if self._availability_check and availability: if self._availability_check and availability:
self._availability_tracker.start(now=False) # wait... self._availability_tracker.start(now=False) # wait...

View File

@ -73,15 +73,16 @@ def make_cli_character(character_config,
password=get_nucypher_password(confirm=False)) password=get_nucypher_password(confirm=False))
# Handle Teachers # Handle Teachers
# TODO: Is this still relevant? Is it better to DRY this up by doing it later?
teacher_nodes = list() teacher_nodes = list()
if load_preferred_teachers: # if load_preferred_teachers:
teacher_nodes = load_seednodes(emitter, # teacher_nodes = load_seednodes(emitter,
teacher_uris=[teacher_uri] if teacher_uri else None, # teacher_uris=[teacher_uri] if teacher_uri else None,
min_stake=min_stake, # min_stake=min_stake,
federated_only=character_config.federated_only, # federated_only=character_config.federated_only,
network_domains=character_config.domains, # network_domains=character_config.domains,
network_middleware=character_config.network_middleware, # network_middleware=character_config.network_middleware,
registry=character_config.registry) # registry=character_config.registry)
# #
# Character Init # Character Init

View File

@ -354,19 +354,26 @@ class Learner:
elif now: elif now:
self.log.info("Starting Learning Loop NOW.") self.log.info("Starting Learning Loop NOW.")
if self.lonely: # if self.lonely:
self.done_seeding = True # self.done_seeding = True
self.read_nodes_from_storage() # self.read_nodes_from_storage()
#
else: # else:
self.load_seednodes() # self.load_seednodes()
try:
self.learn_from_teacher_node() self.learn_from_teacher_node()
except self.NotEnoughTeachers:
if self.lonely:
assert False
else:
assert False
self.learning_deferred = self._learning_task.start(interval=self._SHORT_LEARNING_DELAY) self.learning_deferred = self._learning_task.start(interval=self._SHORT_LEARNING_DELAY)
self.learning_deferred.addErrback(self.handle_learning_errors) self.learning_deferred.addErrback(self.handle_learning_errors)
return self.learning_deferred return self.learning_deferred
else: else:
self.log.info("Starting Learning Loop.") self.log.info("Starting Learning Loop.")
self.cycle_teacher_node()
learning_deferreds = list() learning_deferreds = list()
if not self.lonely: if not self.lonely: