File tree 5 files changed +33
-8
lines changed
5 files changed +33
-8
lines changed Original file line number Diff line number Diff line change 1
1
.Python
2
- bin /
3
- include /
4
- lib /
5
- share /
6
- src /
2
+ * .swp
3
+ * .swo
7
4
* .pyc
5
+ * .pyo
6
+ /* .egg-info
7
+ /.tox
8
+ /build
9
+ /dist
Original file line number Diff line number Diff line change @@ -13,6 +13,8 @@ This library is distributed as 'fluent-logger' python package. Please execute th
13
13
14
14
$ pip install fluent-logger
15
15
16
+ On Python 2.5, you have to install 'simplejson' in addition.
17
+
16
18
## Configuration
17
19
18
20
Fluent daemon must be lauched with the following configuration:
Original file line number Diff line number Diff line change 4
4
import msgpack
5
5
import socket
6
6
import threading
7
- import json
7
+
8
+ try :
9
+ import json
10
+ except ImportError :
11
+ import simplejson as json
8
12
9
13
from fluent import sender
10
14
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/python
2
2
3
- from distutils .core import setup
4
3
from os import path
5
4
5
+ try :
6
+ from setuptools import setup
7
+ except ImportError :
8
+ from distutils .core import setup
9
+
6
10
README = path .abspath (path .join (path .dirname (__file__ ), 'README.md' ))
7
11
desc = 'A Python logging handler for Fluentd event collector'
8
12
24
28
'Programming Language :: Python :: 3' ,
25
29
'Development Status :: 4 - Beta' ,
26
30
'Intended Audience :: Developers' ,
27
- ]
31
+ ],
32
+ test_suite = 'tests'
28
33
)
Original file line number Diff line number Diff line change
1
+ [tox]
2
+ envlist = py25, py26, py27
3
+
4
+ [testenv]
5
+ commands =python setup.py test
6
+
7
+ [testenv:py25]
8
+ deps = simplejson
9
+
10
+ [testenv:py26]
11
+
12
+ [testenv:py27]
You can’t perform that action at this time.
0 commit comments