diff options
| -rw-r--r-- | pylog/onaplogging/logWatchDog.py | 14 | ||||
| -rw-r--r-- | pylog/onaplogging/mdcformatter.py | 2 | ||||
| -rw-r--r-- | pylog/setup.py | 4 | ||||
| -rw-r--r-- | pylog/version.properties | 28 |
4 files changed, 39 insertions, 9 deletions
diff --git a/pylog/onaplogging/logWatchDog.py b/pylog/onaplogging/logWatchDog.py index e0673e3..154dc41 100644 --- a/pylog/onaplogging/logWatchDog.py +++ b/pylog/onaplogging/logWatchDog.py @@ -39,14 +39,14 @@ class FileEventHandlers(FileSystemEventHandler): try: if event.src_path == self.filepath: newConfig = _yaml2Dict(self.filepath) - print ("reload logging configure file %s" % event.src_path) + print("reload logging configure file %s" % event.src_path) config.dictConfig(newConfig) self.currentConfig = newConfig - except Exception as e: - traceback.print_exc(e) - print ("Reuse the old configuration to avoid this " - "exception terminate program") + except Exception: + traceback.print_exc() + print("Reuse the old configuration to avoid this" + "exception terminate program") if self.currentConfig: config.dictConfig(self.currentConfig) @@ -84,8 +84,8 @@ def _yamlConfig(filepath=None, watchDog=None): # here we keep the correct configuration for reusing event_handler.currentConfig = dictConfig - except Exception as e: - traceback.print_exc(e) + except Exception: + traceback.print_exc() def patch_loggingYaml(): diff --git a/pylog/onaplogging/mdcformatter.py b/pylog/onaplogging/mdcformatter.py index f63ec94..253420d 100644 --- a/pylog/onaplogging/mdcformatter.py +++ b/pylog/onaplogging/mdcformatter.py @@ -114,7 +114,7 @@ class MDCFormatter(logging.Formatter): return s except KeyError as e: - print ("The mdc key %s format is wrong" % e.message) + print("The mdc key %s format is wrong" % e.message) except Exception: raise diff --git a/pylog/setup.py b/pylog/setup.py index bcd2347..f69e913 100644 --- a/pylog/setup.py +++ b/pylog/setup.py @@ -18,7 +18,9 @@ setup( name='onappylog', keywords=("yaml", "logging", "mdc", "onap"), description='onap python logging library', - long_description="python-package onappylog could be used in any python project to record MDC information and reload logging at runtime", + long_description="python-package onappylog could be used in any python" + "project to record MDC information and reload logging" + "at runtime", version="1.0.5", license="MIT Licence", author='ke liang', diff --git a/pylog/version.properties b/pylog/version.properties new file mode 100644 index 0000000..30248ed --- /dev/null +++ b/pylog/version.properties @@ -0,0 +1,28 @@ +#!/bin/bash +# Copyright (c) 2017-2018 VMware, Inc. +# +# 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. + +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=2 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file |