Skip to content

Commit d15665e

Browse files
committed
增加setting传递功能
1 parent fde604e commit d15665e

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

log_to_kafka/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding:utf-8 -*-
22

3-
VERSION = '1.0.2'
3+
VERSION = '1.0.4'
44

55
AUTHOR = "cn"
66

log_to_kafka/logger.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ class Logger(object):
190190
setting_wrapper = SettingsWrapper()
191191

192192
def __init__(self, settings=None):
193-
self.settings = self.setting_wrapper.load(settings, default_settings)
193+
194+
if isinstance(settings, dict):
195+
self.settings = settings
196+
else:
197+
self.settings = self.setting_wrapper.load(settings, default_settings)
194198

195199
def set_logger(self, logger=None):
196200
if logger:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
except:
77
from distutils.core import setup
88

9-
VERSION = '1.0.3'
9+
VERSION = '1.0.4'
1010

1111
AUTHOR = "cn"
1212

0 commit comments

Comments
 (0)