remove id migration and directory lookup
This commit is contained in:
parent
9f396acd48
commit
cf3762dd7f
5 changed files with 8 additions and 116 deletions
27
oml/nodes.py
27
oml/nodes.py
|
|
@ -105,25 +105,6 @@ class Node(Thread):
|
|||
else:
|
||||
self.local = None
|
||||
self.port = 9851
|
||||
if len(self.user_id) == 43:
|
||||
self.migrate_id()
|
||||
|
||||
|
||||
def migrate_id(self):
|
||||
import ed25519
|
||||
from . import directory
|
||||
key = self.user_id.encode()
|
||||
vk = ed25519.VerifyingKey(key, encoding=ENCODING)
|
||||
try:
|
||||
r = directory.get(vk)
|
||||
except:
|
||||
logger.debug('directory failed', exc_info=True)
|
||||
r = None
|
||||
if r and 'id' in r and len(r['id']) == 16:
|
||||
u = self.user
|
||||
self.user_id = r['id']
|
||||
u.migrate_id(self.user_id)
|
||||
self._opener = get_opener(self.user_id)
|
||||
|
||||
def get_local(self):
|
||||
if self._nodes and self._nodes._local:
|
||||
|
|
@ -546,14 +527,6 @@ def update_online():
|
|||
if state.online:
|
||||
for node in list(state.nodes._nodes.values()):
|
||||
node.trigger_status()
|
||||
if settings.OLD_USER_ID and not settings.server.get('migrated_id', False):
|
||||
from . import directory
|
||||
r = directory.put(settings.sk, {
|
||||
'id': settings.USER_ID,
|
||||
})
|
||||
logger.debug('push id to directory %s', r)
|
||||
if r:
|
||||
settings.server['migrated_id'] = True
|
||||
|
||||
def check_nodes():
|
||||
if state.online:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue