From a350ca2b4995df6d75c9021dd537589896dccff6 Mon Sep 17 00:00:00 2001 From: liangke Date: Thu, 6 Sep 2018 15:37:38 +0800 Subject: Support Marker in python logging 1 Add 'Marker' feature which carry extra contextual information for loggers, can be used to mark a single log statement 2 Make MDC Formatter have "marker" label. Change-Id: I21ac547b97c49190393d57ff290dcbc3ae20da2a Issue-ID: MULTICLOUD-328 Signed-off-by: liangke --- pylog/onaplogging/marker/markerHandler.py | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pylog/onaplogging/marker/markerHandler.py (limited to 'pylog/onaplogging/marker/markerHandler.py') diff --git a/pylog/onaplogging/marker/markerHandler.py b/pylog/onaplogging/marker/markerHandler.py new file mode 100644 index 0000000..ca5f483 --- /dev/null +++ b/pylog/onaplogging/marker/markerHandler.py @@ -0,0 +1,51 @@ +# Copyright 2018 ke liang . +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import sys +from logging.handlers import SMTPHandler +from marker import matchMarkerHelp + + +class MarkerNotifyHandler(SMTPHandler): + + def __init__(self, mailhost, fromaddr, toaddrs, subject, + credentials=None, secure=None, timeout=5.0, markers=None): + + if sys.version_info > (3, 2): + super(MarkerNotifyHandler, self).__init__( + mailhost, fromaddr, toaddrs, subject, + credentials, secure, timeout) + elif sys.version_info > (2, 7): + super(MarkerNotifyHandler, self).__init__( + mailhost, fromaddr, toaddrs, subject, + credentials, secure) + else: + SMTPHandler.__init__(self, + mailhost, fromaddr, toaddrs, subject, + credentials, secure) + + self.markers = markers + + def handle(self, record): + + if self.markers is None: + return False + + if matchMarkerHelp(record, self.markers): + if sys.version_info > (2, 7): + return super(SMTPHandler, self).handle(record) + else: + return SMTPHandler.handle(self, record) + + return False -- cgit 1.2.3-korg