Skip to content

Commit 1e5be7b

Browse files
committed
changed logging destination to stdout
1 parent bf70149 commit 1e5be7b

File tree

4 files changed

+36
-72
lines changed

4 files changed

+36
-72
lines changed

main.py

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,22 @@ def prepare_loggers():
6464
global main_logger
6565

6666
asyncio_logger = logging.getLogger("asyncio")
67-
asyncio_logger_file_handler = logging.FileHandler("logs/asyncio.log")
68-
asyncio_logger_file_handler.setLevel(logging.DEBUG)
69-
asyncio_logger_file_handler.setFormatter(
70-
logging.Formatter(
71-
"%(levelname)s ~ %(asctime)s ~ %(funcName)30s() - %(message)s"
72-
)
73-
)
74-
asyncio_logger.addHandler(asyncio_logger_file_handler)
75-
76-
if settings.DEBUG:
77-
asyncio.get_event_loop().set_debug(True)
78-
79-
asyncio_logger.setLevel(logging.DEBUG)
67+
asyncio_logger.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
68+
asyncio_logger_handler = logging.StreamHandler(sys.stdout)
69+
asyncio_logger_handler.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
70+
asyncio_logger_handler.setFormatter(
71+
logging.Formatter(settings.LOG_FORMAT_STRING)
72+
)
73+
asyncio_logger.addHandler(asyncio_logger_handler)
74+
asyncio.get_event_loop().set_debug(settings.DEBUG)
8075

8176
main_logger = logging.getLogger("proxy_py/main")
82-
83-
if settings.DEBUG:
84-
main_logger.setLevel(logging.DEBUG)
85-
else:
86-
main_logger.setLevel(logging.INFO)
87-
88-
logger_file_handler = logging.FileHandler("logs/main.log")
89-
logger_file_handler.setLevel(logging.DEBUG)
90-
logger_file_handler.setFormatter(
91-
logging.Formatter(
92-
"%(levelname)s ~ %(asctime)s ~ %(funcName)30s() ~ %(message)s"
93-
)
94-
)
95-
96-
main_logger.addHandler(logger_file_handler)
77+
main_logger.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
78+
logger_handler = logging.StreamHandler(sys.stdout)
79+
logger_handler.setFormatter(logging.Formatter(settings.LOG_FORMAT_STRING))
80+
logger_handler.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
81+
82+
main_logger.addHandler(logger_handler)
9783

9884

9985
async def core():
@@ -164,9 +150,9 @@ def main():
164150
sys.argv = sys.argv[1:]
165151
try:
166152
return {
167-
'core': lambda: asyncio.get_event_loop().run_until_complete(core()),
168-
'server': server,
169-
}[command]()
153+
'core': lambda: asyncio.get_event_loop().run_until_complete(core()),
154+
'server': server,
155+
}[command]()
170156
except KeyError:
171157
print_help()
172158
return 0

processor.py

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import time
1010
import logging
1111
import peewee
12-
13-
14-
15-
LOGGERS_FORMAT = "%(levelname)s ~ %(asctime)s ~ %(funcName)30s() ~ %(message)s"
12+
import sys
1613

1714

1815
class Processor:
@@ -31,29 +28,22 @@ def get_instance():
3128

3229
def __init__(self):
3330
self.logger = logging.getLogger("proxy_py/processor")
31+
self.logger.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
3432

35-
if settings.DEBUG:
36-
self.logger.setLevel(logging.DEBUG)
37-
else:
38-
self.logger.setLevel(logging.INFO)
39-
40-
logger_file_handler = logging.FileHandler("logs/processor.log")
41-
logger_file_handler.setLevel(logging.DEBUG)
42-
logger_file_handler.setFormatter(logging.Formatter(LOGGERS_FORMAT))
33+
logger_handler = logging.StreamHandler(sys.stdout)
34+
logger_handler.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
35+
logger_handler.setFormatter(logging.Formatter(settings.LOG_FORMAT_STRING))
4336

44-
self.logger.addHandler(logger_file_handler)
37+
self.logger.addHandler(logger_handler)
4538

4639
self.collectors_logger = logging.getLogger("proxy_py/collectors")
47-
if settings.DEBUG:
48-
self.collectors_logger.setLevel(logging.DEBUG)
49-
else:
50-
self.collectors_logger.setLevel(logging.INFO)
40+
self.collectors_logger.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
5141

52-
collectors_logger_file_handler = logging.FileHandler("logs/collectors.log")
53-
collectors_logger_file_handler.setLevel(logging.DEBUG)
54-
logger_file_handler.setFormatter(logging.Formatter(LOGGERS_FORMAT))
42+
collectors_logger_handler = logging.StreamHandler(sys.stdout)
43+
collectors_logger_handler.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
44+
collectors_logger_handler.setFormatter(logging.Formatter(settings.LOG_FORMAT_STRING))
5545

56-
self.collectors_logger.addHandler(collectors_logger_file_handler)
46+
self.collectors_logger.addHandler(collectors_logger_handler)
5747

5848
self.logger.debug("processor initialization...")
5949

proxy_py/_settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
# enable to get more information in logs
1818
DEBUG = False
19+
LOG_FORMAT_STRING = "%(levelname)s ~ [%(name)s] ~ %(asctime)s ~ %(funcName)30s():L%(lineno)d - %(message)s"
1920

2021

2122
"""

server/proxy_provider_server.py

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,20 @@
1111
import logging
1212
import aiohttp
1313
import aiohttp_jinja2
14+
import sys
1415

1516

1617
class ProxyProviderServer(BaseApp):
1718
def __init__(self, host, port):
1819
logger = logging.getLogger("proxy_py/server")
20+
logger.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
1921

20-
if settings.DEBUG:
21-
logger.setLevel(logging.DEBUG)
22-
else:
23-
logger.setLevel(logging.INFO)
24-
25-
logger_file_handler = logging.FileHandler("logs/server.log")
26-
logger_file_handler.setLevel(logging.DEBUG)
27-
logger_file_handler.setFormatter(logging.Formatter(
28-
"%(levelname)s ~ %(asctime)s ~ %(client_ip)s ~ %(message)s"
29-
))
30-
31-
logger.addHandler(logger_file_handler)
22+
logger_handler = logging.StreamHandler(sys.stdout)
23+
logger_handler.setLevel(logging.DEBUG if settings.DEBUG else logging.INFO)
24+
logger_handler.setFormatter(logging.Formatter(settings.LOG_FORMAT_STRING))
3225

26+
logger.addHandler(logger_handler)
27+
3328
super(ProxyProviderServer, self).__init__(logger)
3429

3530
self.host = host
@@ -39,14 +34,6 @@ def __init__(self, host, port):
3934
def start(self, loop):
4035
loop.run_until_complete(self.init())
4136

42-
'''
43-
server = await loop.create_server(
44-
self._app.make_handler(),
45-
self.host,
46-
self.port
47-
)
48-
'''
49-
5037
return web.run_app(self._app, host=self.host, port=self.port, loop=loop)
5138

5239
async def setup_router(self):

0 commit comments

Comments
 (0)