From fbf210a3fa73d6ef295cff105a050d44782df1da Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 10 Nov 2020 17:31:12 +0000 Subject: [PATCH 1/3] VR: fix logging is not working and logs are not appended to /var/log/cloud.log --- systemvm/debian/opt/cloud/bin/update_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/update_config.py b/systemvm/debian/opt/cloud/bin/update_config.py index c9121eb634f9..469c6f0cdbf2 100755 --- a/systemvm/debian/opt/cloud/bin/update_config.py +++ b/systemvm/debian/opt/cloud/bin/update_config.py @@ -16,9 +16,11 @@ # specific language governing permissions and limitations # under the License. +import logging +logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') + import sys from merge import QueueFile -import logging import subprocess from subprocess import PIPE, STDOUT import os @@ -26,8 +28,6 @@ import configure import json -logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') - # first commandline argument should be the file to process argc = len(sys.argv) if argc != 2 and argc != 3: From 138de19259289378056fdced4e31e04f4752c267 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 18 Nov 2020 20:30:27 +0000 Subject: [PATCH 2/3] Revert " #4466 VR: fix logging is not working and logs are not appended to /var/log/cloud.log" This reverts commit 843a380a923fc91e717440f7af910b3d8933de9f. --- systemvm/debian/opt/cloud/bin/update_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/update_config.py b/systemvm/debian/opt/cloud/bin/update_config.py index 469c6f0cdbf2..c9121eb634f9 100755 --- a/systemvm/debian/opt/cloud/bin/update_config.py +++ b/systemvm/debian/opt/cloud/bin/update_config.py @@ -16,11 +16,9 @@ # specific language governing permissions and limitations # under the License. -import logging -logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') - import sys from merge import QueueFile +import logging import subprocess from subprocess import PIPE, STDOUT import os @@ -28,6 +26,8 @@ import configure import json +logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') + # first commandline argument should be the file to process argc = len(sys.argv) if argc != 2 and argc != 3: From 42f37a41f789627efdeaa5ae7a82daff6667ae99 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 18 Nov 2020 20:43:02 +0000 Subject: [PATCH 3/3] #4466 VR: Add logging.basicConfig to /opt/cloud/bin/cs/__init__.py --- systemvm/debian/opt/cloud/bin/configure.py | 4 ---- systemvm/debian/opt/cloud/bin/cs/__init__.py | 9 +++++++++ systemvm/debian/opt/cloud/bin/update_config.py | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/configure.py b/systemvm/debian/opt/cloud/bin/configure.py index 5d60fab2b172..01e580fce2f6 100755 --- a/systemvm/debian/opt/cloud/bin/configure.py +++ b/systemvm/debian/opt/cloud/bin/configure.py @@ -1019,10 +1019,6 @@ def main(argv): # The "GLOBAL" Configuration object config = CsConfig() - logging.basicConfig(filename=config.get_logger(), - level=config.get_level(), - format=config.get_format()) - # Load stored ip addresses from disk to CsConfig() config.set_address() diff --git a/systemvm/debian/opt/cloud/bin/cs/__init__.py b/systemvm/debian/opt/cloud/bin/cs/__init__.py index 13a83393a912..dc0c3d9517d8 100755 --- a/systemvm/debian/opt/cloud/bin/cs/__init__.py +++ b/systemvm/debian/opt/cloud/bin/cs/__init__.py @@ -14,3 +14,12 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + +import logging +from cs.CsConfig import CsConfig + +config = CsConfig() + +logging.basicConfig(filename=config.get_logger(), + level=config.get_level(), + format=config.get_format()) diff --git a/systemvm/debian/opt/cloud/bin/update_config.py b/systemvm/debian/opt/cloud/bin/update_config.py index c9121eb634f9..518a31ca5eda 100755 --- a/systemvm/debian/opt/cloud/bin/update_config.py +++ b/systemvm/debian/opt/cloud/bin/update_config.py @@ -26,8 +26,6 @@ import configure import json -logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') - # first commandline argument should be the file to process argc = len(sys.argv) if argc != 2 and argc != 3: