@@ -30,43 +30,46 @@ def main():
30
30
)
31
31
if config ['ts3server' ]['enabled' ]:
32
32
ts3_server_args = [
33
+ logging ,
33
34
config ['ts3server' ]['relayAddress' ],
34
35
int (config ['ts3server' ]['relayPort' ]),
35
36
config ['ts3server' ]['remoteAddress' ],
36
37
int (config ['ts3server' ]['remotePort' ]),
37
38
config ['ts3server' ]['whitelist' ],
38
39
config ['ts3server' ]['blacklist' ]
39
40
]
40
- ts3_server = Udp (logging , * ts3_server_args [: 4 ] )
41
+ ts3_server = Udp (* ts3_server_args )
41
42
t1 = threading .Thread (target = ts3_server .relay )
42
43
t1 .start ()
43
- logging .info ('Voice: {0 }:{1 } <-> {2 }:{3 }' .format (* ts3_server_args ))
44
+ logging .info ('Voice: {1 }:{2 } <-> {3 }:{4 }' .format (* ts3_server_args ))
44
45
if config ['ts3FileTransfer' ]['enabled' ]:
45
46
file_transfer_args = [
47
+ logging ,
46
48
config ['ts3FileTransfer' ]['relayAddress' ],
47
49
int (config ['ts3FileTransfer' ]['relayPort' ]),
48
50
config ['ts3FileTransfer' ]['remoteAddress' ],
49
51
int (config ['ts3FileTransfer' ]['remotePort' ]),
50
52
config ['ts3FileTransfer' ]['whitelist' ],
51
53
config ['ts3FileTransfer' ]['blacklist' ]
52
54
]
53
- file_transfer = Tcp (logging , * file_transfer_args [: 4 ] )
55
+ file_transfer = Tcp (* file_transfer_args )
54
56
t2 = threading .Thread (target = file_transfer .relay )
55
57
t2 .start ()
56
- logging .info ('FileTransfer: {0 }:{1 } <-> {2 }:{3 }' .format (* file_transfer_args ))
58
+ logging .info ('FileTransfer: {1 }:{2 } <-> {3 }:{4 }' .format (* file_transfer_args ))
57
59
if config ['ts3ServerQuery' ]['enabled' ]:
58
60
server_query_args = [
61
+ logging ,
59
62
config ['ts3ServerQuery' ]['relayAddress' ],
60
63
int (config ['ts3ServerQuery' ]['relayPort' ]),
61
64
config ['ts3ServerQuery' ]['remoteAddress' ],
62
65
int (config ['ts3ServerQuery' ]['remotePort' ]),
63
66
config ['ts3ServerQuery' ]['whitelist' ],
64
67
config ['ts3ServerQuery' ]['blacklist' ]
65
68
]
66
- server_query = Tcp (logging , * server_query_args [: 4 ] )
69
+ server_query = Tcp (* server_query_args )
67
70
t3 = threading .Thread (target = server_query .relay )
68
71
t3 .start ()
69
- logging .info ('ServerQuery: {0 }:{1 } <-> {2 }:{3 }' .format (* server_query_args ))
72
+ logging .info ('ServerQuery: {1 }:{2 } <-> {3 }:{4 }' .format (* server_query_args ))
70
73
except KeyboardInterrupt :
71
74
exit (0 )
72
75
0 commit comments