Royce Lv has uploaded a new change for review.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
[WIP]normalize startup: seperate supervdsm logger from vdsm ones
If supervdsm use same log config file with vdsm, it will create all log file with root ownership. Make supervdsm use seperate logger with vdsm to solve logging problem.
Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Signed-off-by: Royce Lvlvroyce@linux.vnet.ibm.com --- M vdsm/logger.conf.in M vdsm/supervdsmServer.py 2 files changed, 11 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/10709/1
diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index edd4616..0a4622f 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -1,5 +1,5 @@ [loggers] -keys=root,vds,Storage,metadata,SuperVdsm +keys=root,vds,Storage,metadata
[handlers] keys=console,syslog,logfile,metadata @@ -22,12 +22,6 @@ level=DEBUG handlers=syslog,logfile qualname=Storage -propagate=0 - -[logger_SuperVdsm] -level=DEBUG -handlers=syslog,logfile -qualname=SuperVdsm propagate=0
[logger_metadata] diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 105faf3..f2279c2 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -88,7 +88,7 @@
KB = 2 ** 10 TEST_BUFF_LEN = 4 * KB -LOG_CONF_PATH = "/etc/vdsm/logger.conf" +LOG_PATH = "/var/log/vdsm/supervdsm.log"
class _SuperVdsm(object): @@ -320,6 +320,14 @@ os.kill(os.getpid(), signal.SIGTERM)
+def initLogger(): + logging.basicConfig(filename=LOG_PATH, filemode='w+', + level=logging.DEBUG) + logger = logging.getLogger("SuperVdsm.Server") + logger.info("Init supervdsm logger") + return logger + + def main(): if _glusterEnabled: def bind(func): @@ -334,16 +342,7 @@ 'gluster%s%s' % (name[0].upper(), name[1:]), logDecorator(bind(func)))
- try: - logging.config.fileConfig(LOG_CONF_PATH) - except: - logging.basicConfig(filename='/dev/stdout', filemode='w+', - level=logging.DEBUG) - log = logging.getLogger("SuperVdsm.Server") - log.warn("Could not init proper logging", exc_info=True) - - log = logging.getLogger("SuperVdsm.Server") - + log = initLogger() try: log.debug("Making sure I'm root") if os.geteuid() != 0:
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/621/ (1/2)
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 1: Fails
Build Failed
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/621/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/586/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/586/ (2/2)
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/626/ (1/2)
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/591/ (2/2)
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/626/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/591/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Royce Lv has abandoned this change.
Change subject: [WIP]normalize startup: seperate supervdsm logger from vdsm ones ......................................................................
Patch Set 2: Abandoned
-- To view, visit http://gerrit.ovirt.org/10709 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon Gerrit-Change-Id: I36d1f2ef6751f9df6cd370123fd3b808c4e650ed Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org