oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UserManager exclusive logging

Browse source
This commit is contained in:
shortcutme 2018-04-12 19:22:06 +02:00
parent d4a1764d20
commit 151a6ce9e3
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/User/UserManager.py
View file

@ -1,6 +1,7 @@
# Included modules # Included modules
import json import json
import logging import logging
import time
# ZeroNet Modules # ZeroNet Modules
from User import User from User import User
@ -12,6 +13,7 @@ from Config import config
class UserManager(object): class UserManager(object):
def __init__(self): def __init__(self):
self.users = {} self.users = {}
self.log = logging.getLogger("UserManager")
# Load all user from data/users.json # Load all user from data/users.json
def load(self): def load(self):
@ -20,6 +22,7 @@ class UserManager(object):
user_found = [] user_found = []
added = 0 added = 0
s = time.time()
# Load new users # Load new users
for master_address, data in json.load(open("%s/users.json" % config.data_dir)).items(): for master_address, data in json.load(open("%s/users.json" % config.data_dir)).items():
if master_address not in self.users: if master_address not in self.users:
@ -32,16 +35,16 @@ class UserManager(object):
for master_address in self.users.keys(): for master_address in self.users.keys():
if master_address not in user_found: if master_address not in user_found:
del(self.users[master_address]) del(self.users[master_address])
logging.debug("Removed user: %s" % master_address) self.log.debug("Removed user: %s" % master_address)
if added: if added:
logging.debug("UserManager added %s users" % added) self.log.debug("Added %s users in %.3fs" % (added, time.time() - s))
# Create new user # Create new user
# Return: User # Return: User
def create(self, master_address=None, master_seed=None): def create(self, master_address=None, master_seed=None):
user = User(master_address, master_seed) user = User(master_address, master_seed)
logging.debug("Created user: %s" % user.master_address) self.log.debug("Created user: %s" % user.master_address)
if user.master_address: # If successfully created if user.master_address: # If successfully created
self.users[user.master_address] = user self.users[user.master_address] = user
user.save() user.save()