8000 PEP8/misc fixes · socrateslee/fluent-logger-python@ca47ab2 · GitHub
[go: up one dir, main page]
Skip to content

Commit ca47ab2

Browse files
EvaSDKEvaSDK
committed
PEP8/misc fixes
Fix indentation, spacing, imports order, variable names, etc.
1 parent 405d4dd commit ca47ab2

File tree

8 files changed

+85
-53
lines changed

8 files changed

+85
-53
lines changed

‎fluent/event.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
from fluent import sender
1+
# -*- coding: utf-8 -*-
2+
23
import time
34

5+
from fluent import sender
6+
7+
48
class Event(object):
59
def __init__(self, label, data, **kwargs):
610
assert isinstance(data, dict), 'data must be a dict'

‎fluent/handler.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
import logging
24
import socket
35

@@ -8,22 +10,22 @@
810

911
from fluent import sender
1012

13+
1114
class FluentRecordFormatter(object):
1215
def __init__(self):
1316
self.hostname = socket.gethostname()
1417

1518
def format(self, record):
16-
data = {
17-
'sys_host' : self.hostname,
18-
'sys_name' : record.name,
19-
'sys_module' : record.module,
20-
# 'sys_lineno' : record.lineno,
21-
# 'sys_levelno' : record.levelno,
22-
# 'sys_levelname' : record.levelname,
23-
# 'sys_filename' : record.filename,
24-
# 'sys_funcname' : record.funcName,
25-
# 'sys_exc_info' : record.exc_info,
26-
}
19+
data = {'sys_host': self.hostname,
20+
'sys_name': record.name,
21+
'sys_module': record.module,
22+
# 'sys_lineno': record.lineno,
23+
# 'sys_levelno': record.levelno,
24+
# 'sys_levelname': record.levelname,
25+
# 'sys_filename': record.filename,
26+
# 'sys_funcname': record.funcName,
27+
# 'sys_exc_info': record.exc_info,
28+
}
2729
# if 'sys_exc_info' in data and data['sys_exc_info']:
2830
# data['sys_exc_info'] = self.formatException(data['sys_exc_info'])
2931

@@ -45,16 +47,17 @@ def _add_dic(data, dic):
4547
if isinstance(key, basestring):
4648
data[str(key)] = value
4749

50+
4851
class FluentHandler(logging.Handler):
4952
'''
5053
Logging Handler for fluent.
5154
'''
5255
def __init__(self,
53-
tag,
54-
host='localhost',
55-
port=24224,
56-
timeout=3.0,
57-
verbose=False):
56+
tag,
57+
host='localhost',
58+
port=24224,
59+
timeout=3.0,
60+
verbose=False):
5861

5962
self.tag = tag
6063
self.sender = sender.FluentSender(tag,

‎fluent/sender.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1+
# -*- coding: utf-8 -*-
2+
13
from __future__ import print_function
2-
import msgpack
34
import socket
45
import threading
56
import time
67

8+
import msgpack
9+
10+
711
_global_sender = None
812

13+
914
def setup(tag, **kwargs):
1015
host = kwargs.get('host', 'localhost')
1116
port = kwargs.get('port', 24224)
1217

1318
global _global_sender
1419
_global_sender = FluentSender(tag, host=host, port=port)
1520

21+
1622
def get_global_sender():
1723
return _global_sender
1824

25+
1926
class FluentSender(object):
2027
def __init__(self,
2128
tag,
@@ -36,7 +43,7 @@ def __init__(self,
3643
self.pendings = None
3744
self.packer = msgpack.Packer()
3845
self.lock = threading.Lock()
39-
46+
4047
try:
4148
self._reconnect()
4249
except Exception:

‎tests/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
from tests.test_event import *
24
from tests.test_sender import *
35
from tests.test_handler import *

‎tests/mockserver.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
import socket
2-
import threading
3-
import time
4-
from msgpack import Unpacker
1+
# -*- coding: utf-8 -*-
52

63
try:
74
from cStringIO import StringIO as BytesIO
85
except ImportError:
96
from io import BytesIO
107

8+
import socket
9+
import threading
10+
import time
11+
12+
from msgpack import Unpacker
13+
14+
1115
class MockRecvServer(threading.Thread):
1216
"""
1317
Single threaded server accepts one connection and recv until EOF.
@@ -21,16 +25,16 @@ def __init__(self, port):
2125
self.start()
2226

2327
def run(self):
24-
s = self._sock
25-
s.listen(1)
26-
con, _ = s.accept()
28+
sock = self._sock
29+
sock.listen(1)
30+
con, _ = sock.accept()
2731
while True:
28-
d = con.recv(4096)
29-
if not d:
32+
data = con.recv(4096)
33+
if not data:
3034
break
31-
self._buf.write(d)
35+
self._buf.write(data)
3236
con.close()
33-
s.close()
37+
sock.close()
3438
self._sock = None
3539

3640
def wait(self):
@@ -40,5 +44,6 @@ def wait(self):
4044
def get_recieved(self):
4145
self.wait()
4246
self._buf.seek(0)
43-
# TODO: have to process string encoding properly. currently we assume that all encoding is utf-8.
47+
# TODO: have to process string encoding properly. currently we assume
48+
# that all encoding is utf-8.
4449
return list(Unpacker(self._buf, encoding='utf-8'))

‎tests/test_event.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
# -*- coding: utf-8 -*-
2+
13
import unittest
24

35
from fluent import event, sender
46

7+
58
sender.setup(server='localhost', tag='app')
69

10+
711
class TestHandler(unittest.TestCase):
812
def testLogging(self):
913
# send event with tag app.follow
1014
event.Event('follow', {
11-
'from': 'userA',
12-
'to': 'userB'
15+
'from': 'userA',
16+
'to': 'userB'
1317
})
1418

1519
# send event with tag app.follow, with timestamp
1620
event.Event('follow', {
17-
'from': 'userA',
18-
'to': 'userB'
21+
'from': 'userA',
22+
'to': 'userB'
1923
}, time=int(0))
20-

‎tests/test_handler.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
import unittest
2-
from tests import mockserver
1+
# -*- coding: utf-8 -*-
2+
33
import logging
4+
import unittest
5+
46
import fluent.handler
57

8+
from tests import mockserver
9+
10+
611
class TestLogger(unittest.TestCase):
712
def setUp(self):
813
super(TestLogger, self).setUp()
@@ -11,23 +16,23 @@ def setUp(self):
1116
self._server = mockserver.MockRecvServer(port)
1217
self._port = port
1318
break
14-
except IOError as e:
19+
except IOError:
1520
pass
1621

1722
def get_data(self):
1823
return self._server.get_recieved()
1924

2025
def test_simple(self):
21-
h = fluent.handler.FluentHandler('app.follow', port=self._port)
26+
handler = fluent.handler.FluentHandler('app.follow', port=self._port)
2227

2328
logging.basicConfig(level=logging.INFO)
24-
l = logging.getLogger('fluent.test')
25-
l.addHandler(h)
26-
l.info({
29+
log = logging.getLogger('fluent.test')
30+
log.addHandler(handler)
31+
log.info({
2732
'from': 'userA',
2833
'to': 'userB'
2934
})
30-
h._close()
35+
handler._close()
3136

3237
data = self.get_data()
3338
eq = self.assertEqual

‎tests/test_sender.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1+
# -*- coding: utf-8 -*-
2+
13
from __future__ import print_function
24
import unittest
3-
from tests import mockserver
5+
46
import fluent.sender
57

8+
from tests import mockserver
9+
10+
611
class TestSender(unittest.TestCase):
712
def setUp(self):
813
super(TestSender, self).setUp()
914
for port in range(10000, 20000):
1015
try:
1116
self._server = mockserver.MockRecvServer(port)
1217
break
13-
except IOError as e:
14-
print(e)
15-
pass
16-
self._sender = fluent.sender.FluentSender(
17-
tag='test',
18-
port=port,
19-
)
18+
except IOError as exc:
19+
print(exc)
20+
self._sender = fluent.sender.FluentSender(tag='test',
21+
port=port,
22+
)
2023

2124
def get_data(self):
2225
return self._server.get_recieved()
@@ -30,6 +33,6 @@ def test_simple(self):
3033
eq(1, len(data))
3134
eq(3, len(data[0]))
3235
eq('test.foo', data[0][0])
33-
eq({'bar':'baz'}, data[0][2])
36+
eq({'bar': 'baz'}, data[0][2])
3437
self.assert_(data[0][1])
3538
self.assert_(isinstance(data[0][1], int))

0 commit comments

Comments
 (0)
0