Skip to content

Commit b83f443

Browse files
committed
First implementation of an logging function (better then print)
1 parent cd584c2 commit b83f443

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
*.pyc
33
*.sublime-project
44
*.sublime-workspace
5+
6+
*.log

config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
system:
2+
logLevel: INFO
13
ts3server:
24
enabled: True
35
relayAddress: 0.0.0.0

ts3proxy/ts3proxy.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#! /usr/bin/env python3
22
# coding: utf-8
33

4+
import logging
5+
import sys
46
import threading
57
import yaml
68

@@ -15,6 +17,17 @@ def main():
1517
config = yaml.load(stream)
1618
except yaml.YAMLError as exc:
1719
print(exc)
20+
numeric_level = getattr(logging, config['system']['logLevel'].upper(), None)
21+
if not isinstance(numeric_level, int):
22+
raise ValueError('Invalid log level: %s' % config['system']['logLevel'])
23+
logging.basicConfig(
24+
level=numeric_level,
25+
format='[%(asctime)s] %(message)s',
26+
handlers=[
27+
logging.FileHandler("system.log"),
28+
logging.StreamHandler()
29+
]
30+
)
1831
if config['ts3server']['enabled']:
1932
ts3_server_args = [
2033
config['ts3server']['relayAddress'],
@@ -25,7 +38,7 @@ def main():
2538
ts3_server = Udp(*ts3_server_args[:4])
2639
t1 = threading.Thread(target=ts3_server.relay)
2740
t1.start()
28-
print("Voice: {0}:{1} <-> {2}:{3}".format(*ts3_server_args))
41+
logging.info('Voice: {0}:{1} <-> {2}:{3}'.format(*ts3_server_args))
2942
if config['ts3FileTransfer']['enabled']:
3043
file_transfer_args = [
3144
config['ts3FileTransfer']['relayAddress'],
@@ -36,7 +49,7 @@ def main():
3649
file_transfer = Tcp(*file_transfer_args[:4])
3750
t2 = threading.Thread(target=file_transfer.relay)
3851
t2.start()
39-
print("FileTransfer: {0}:{1} <-> {2}:{3}".format(*file_transfer_args))
52+
logging.info('FileTransfer: {0}:{1} <-> {2}:{3}'.format(*file_transfer_args))
4053
if config['ts3ServerQuery']['enabled']:
4154
server_query_args = [
4255
config['ts3ServerQuery']['relayAddress'],
@@ -47,7 +60,7 @@ def main():
4760
server_query = Tcp(*server_query_args[:4])
4861
t3 = threading.Thread(target=server_query.relay)
4962
t3.start()
50-
print("ServerQuery: {0}:{1} <-> {2}:{3}".format(*server_query_args))
63+
logging.info('ServerQuery: {0}:{1} <-> {2}:{3}'.format(*server_query_args))
5164
except KeyboardInterrupt:
5265
exit(0)
5366

0 commit comments

Comments
 (0)