diff --git a/app/main.py b/app/main.py index 3c3ee38..3d36d56 100644 --- a/app/main.py +++ b/app/main.py @@ -48,19 +48,19 @@ Window.size = WINDOW_SIZE # with open('log.txt','w') as of: # of.write('### LOG ###\n') -import logging -handler = logging.StreamHandler() -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') -handler.setFormatter(formatter) -logger = logging.getLogger('app') -logger.addHandler(handler) -logger.setLevel(logging.DEBUG) +# import logging +# handler = logging.StreamHandler() +# formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +# handler.setFormatter(formatter) +# logger = logging.getLogger('app') +# logger.addHandler(handler) +# logger.setLevel(logging.DEBUG) def log(*args): - # with open('log.txt','a+') as of: - # of.write(' '.join([str(x) for x in args])+'\n') - line = ' '.join(str(x) for x in args) - logger.debug(line) + with open('log.txt','a+') as of: + of.write(' '.join([str(x) for x in args])+'\n') + # line = ' '.join(str(x) for x in args) + # logger.debug(line) class MyLayout(MDBoxLayout): scr_mngr = ObjectProperty(None) diff --git a/p2p/api.py b/p2p/api.py index cfbf1e8..2f3a8d4 100644 --- a/p2p/api.py +++ b/p2p/api.py @@ -25,9 +25,9 @@ from main import log DEBUG = True UPLOAD_DIR = 'uploads/' ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'} -NODES_PRIME = [("128.232.229.63",8467), ("68.66.241.111",8467)] -PORT_SPEAK = 8468 -PORT_LISTEN = 8469 +from .p2p import NODES_PRIME +# PORT_SPEAK = 8468 +PORT_LISTEN = 8468 # Api Functions from threading import Thread diff --git a/p2p/p2p.py b/p2p/p2p.py index 48d38ba..9cfa1a3 100644 --- a/p2p/p2p.py +++ b/p2p/p2p.py @@ -8,18 +8,25 @@ import pickle,os # NODES_PRIME = [("128.232.229.63",8468), ("68.66.241.111",8468)] -NODES_PRIME = [("68.66.241.111",8468)] +NODES_PRIME = [("68.66.241.111",8467)] +handler = logging.StreamHandler() +formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +handler.setFormatter(formatter) +logger = logging.getLogger('app') +logger.addHandler(handler) +logger.setLevel(logging.DEBUG) + +def log(*args): + #with open('log.txt','a+') as of: + # of.write(' '.join([str(x) for x in args])+'\n') + line = ' '.join(str(x) for x in args) + logger.debug(line) async def echo(msg): print('echo',msg) def boot_selfless_node(port=8468, loop=None): - handler = logging.StreamHandler() - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - handler.setFormatter(formatter) - log = logging.getLogger('kademlia') - log.addHandler(handler) - log.setLevel(logging.INFO) + if not loop: loop = asyncio.get_event_loop() loop.set_debug(True)