openstack/fuel-library
Code Issues Proposed changes

Merge "Removed extra lines from logging.conf and made it minimalistic"

Browse Source
This commit is contained in:
Victor Galkin 2013-03-25 17:58:23 +04:00 committed by Gerrit Code Review
commit d3c59dd9bb
15 changed files with 130 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
deployment/puppet/cinder/files/logging.conf
View File

@ -1,76 +0,0 @@
[loggers]
keys = root, cinder
[handlers]
keys = stderr, stdout, watchedfile, syslog, null
[formatters]
keys = legacycinder, default
[logger_root]
level = WARNING
handlers = null
[logger_cinder]
level = DEBUG
handlers = syslog
qualname = cinder
[logger_amqplib]
level = WARNING
handlers = stderr
qualname = amqplib
[logger_sqlalchemy]
level = WARNING
handlers = stderr
qualname = sqlalchemy
# "level = INFO" logs SQL queries.
# "level = DEBUG" logs SQL queries and results.
# "level = WARNING" logs neither. (Recommended for production systems.)
[logger_boto]
level = WARNING
handlers = stderr
qualname = boto
[logger_suds]
level = INFO
handlers = stderr
qualname = suds
[logger_eventletwsgi]
level = WARNING
handlers = stderr
qualname = eventlet.wsgi.server
[handler_stderr]
class = StreamHandler
args = (sys.stderr,)
formatter = legacycinder
[handler_stdout]
class = StreamHandler
args = (sys.stdout,)
formatter = legacycinder
[handler_watchedfile]
class = handlers.WatchedFileHandler
args = ('/var/log/cinder/cinder.log',)
formatter = legacycinder
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL3)
formatter = legacycinder
[handler_null]
class = cinder.openstack.common.log.NullHandler
formatter = default
args = ()
[formatter_legacycinder]
class = cinder.openstack.common.log.LegacyFormatter
[formatter_default]
format = %(message)s

14
deployment/puppet/cinder/manifests/base.pp
View File

@ -30,13 +30,13 @@ class cinder::base (
}
if $use_syslog {
cinder_config {'DEFAULT/log_config': value => "/etc/cinder/logging.conf";}
file { "cinder-logging.conf":
source=>"puppet:///modules/cinder/logging.conf",
path => "/etc/cinder/logging.conf",
owner => "cinder",
group => "cinder",
}
cinder_config {'DEFAULT/log_config': value => "/etc/cinder/logging.conf";}
file { "cinder-logging.conf":
content => template('cinder/logging.conf.erb'),
path => "/etc/cinder/logging.conf",
owner => "cinder",
group => "cinder",
}
}
else {
cinder_config {'DEFAULT/log_config': ensure=>absent;}

21
deployment/puppet/cinder/templates/logging.conf.erb Normal file
View File

@ -0,0 +1,21 @@
[loggers]
keys = root
[handlers]
keys = syslog
[formatters]
keys = default
[logger_root]
level = DEBUG
handlers = syslog
qualname = cinder
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL3)
formatter = default
[formatter_default]
format = cinder %(name)s %(levelname)s %(message)s

48
deployment/puppet/glance/files/logging.conf
View File

@ -1,48 +0,0 @@
[loggers]
keys = root, glance
[handlers]
keys = stderr, stdout, watchedfile, syslog, null
[formatters]
keys = legacyglance, default
[logger_root]
level = WARNING
handlers = null
[logger_glance]
level = DEBUG
handlers = syslog
qualname = glance
[handler_stderr]
class = StreamHandler
args = (sys.stderr,)
formatter = legacyglance
[handler_stdout]
class = StreamHandler
args = (sys.stdout,)
formatter = legacyglance
[handler_watchedfile]
class = handlers.WatchedFileHandler
args = ('/var/log/glance/glance.log',)
formatter = legacyglance
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL2)
formatter = legacyglance
[handler_null]
class = glance.openstack.common.log.NullHandler
formatter = default
args = ()
[formatter_legacyglance]
class = glance.openstack.common.log.LegacyFormatter
[formatter_default]
format = %(message)s

17
deployment/puppet/glance/manifests/init.pp
View File

@ -4,8 +4,6 @@ class glance(
include glance::params
file { '/etc/glance/':
ensure => directory,
owner => 'glance',
@ -13,13 +11,14 @@ class glance(
mode => '0770',
require => Package['glance']
}
file {"glance-logging.conf":
source=>"puppet:///modules/glance/logging.conf",
path => "/etc/glance/logging.conf",
owner => "glance",
group => "glance",
require => [User['glance'],Group['glance'],File['/etc/glance/']]
}
file {"glance-logging.conf":
content => template('glance/logging.conf.erb'),
path => "/etc/glance/logging.conf",
owner => "glance",
group => "glance",
require => [User['glance'],Group['glance'],File['/etc/glance/']]
}
group {'glance': gid=> 161, ensure=>present, system=>true}
user {'glance': uid=> 161, ensure=>present, system=>true, gid=>"glance", require=>Group['glance']}
User['glance'] -> Package['glance']

21
deployment/puppet/glance/templates/logging.conf.erb Normal file
View File

@ -0,0 +1,21 @@
[loggers]
keys = root
[handlers]
keys = syslog
[formatters]
keys = default
[logger_root]
level = DEBUG
handlers = syslog
qualname = glance
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL2)
formatter = default
[formatter_default]
format = glance %(name)s %(levelname)s %(message)s

42
deployment/puppet/keystone/files/logging.conf
View File

@ -1,42 +0,0 @@
[loggers]
keys=root,keystone
[formatters]
keys=normal,normal_with_name,debug
[handlers]
keys=production,file,devel
[logger_keystone]
level=DEBUG
handlers=devel
qualname=keystone
[logger_root]
level=DEBUG
handlers=production
[handler_production]
class=handlers.SysLogHandler
formatter=normal_with_name
args=('/dev/log', handlers.SysLogHandler.LOG_LOCAL1)
[handler_file]
class=logging.handlers.WatchedFileHandler
formatter=normal_with_name
args=('/var/log/keystone/keystone.log', 'a')
[handler_devel]
class=StreamHandler
level=NOTSET
formatter=debug
args=(sys.stdout,)
[formatter_normal]
format=%(asctime)s %(levelname)s %(message)s
[formatter_normal_with_name]
format=(%(name)s): %(asctime)s %(levelname)s %(message)s
[formatter_debug]
format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s

2
deployment/puppet/keystone/manifests/init.pp
View File

@ -68,7 +68,7 @@ class keystone(
if $use_syslog {
keystone_config {'DEFAULT/log_config': value => "/etc/keystone/logging.conf";}
file {"keystone-logging.conf":
source=>"puppet:///modules/keystone/logging.conf",
content => template('keystone/logging.conf.erb'),
path => "/etc/keystone/logging.conf",
owner => "keystone",
group => "keystone",

21
deployment/puppet/keystone/templates/logging.conf.erb Normal file
View File

@ -0,0 +1,21 @@
[loggers]
keys = root
[handlers]
keys = syslog
[formatters]
keys = default
[logger_root]
level = DEBUG
handlers = syslog
qualname = keystone
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL1)
formatter = default
[formatter_default]
format = keystone %(name)s %(levelname)s %(message)s

76
deployment/puppet/nova/files/logging.conf
View File

@ -1,76 +0,0 @@
[loggers]
keys = root, nova
[handlers]
keys = stderr, stdout, watchedfile, syslog, null
[formatters]
keys = legacynova, default
[logger_root]
level = WARNING
handlers = null
[logger_nova]
level = DEBUG
handlers = syslog
qualname = nova
[logger_amqplib]
level = WARNING
handlers = stderr
qualname = amqplib
[logger_sqlalchemy]
level = WARNING
handlers = stderr
qualname = sqlalchemy
# "level = INFO" logs SQL queries.
# "level = DEBUG" logs SQL queries and results.
# "level = WARNING" logs neither. (Recommended for production systems.)
[logger_boto]
level = WARNING
handlers = stderr
qualname = boto
[logger_suds]
level = INFO
handlers = stderr
qualname = suds
[logger_eventletwsgi]
level = WARNING
handlers = stderr
qualname = eventlet.wsgi.server
[handler_stderr]
class = StreamHandler
args = (sys.stderr,)
formatter = legacynova
[handler_stdout]
class = StreamHandler
args = (sys.stdout,)
formatter = legacynova
[handler_watchedfile]
class = handlers.WatchedFileHandler
args = ('/var/log/nova/nova.log',)
formatter = legacynova
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL0)
formatter = legacynova
[handler_null]
class = nova.openstack.common.log.NullHandler
formatter = default
args = ()
[formatter_legacynova]
class = nova.openstack.common.log.LegacyFormatter
[formatter_default]
format = %(message)s

16
deployment/puppet/nova/manifests/init.pp
View File

@ -145,16 +145,16 @@ nova_config
value =>'%(levelname)s %(name)s [-] %(instance)s %(message)s';
}
file {"nova-logging.conf":
source=>"puppet:///modules/nova/logging.conf",
path => "/etc/nova/logging.conf",
owner => "nova",
group => "nova",
require => [Package['nova-common']]
file {"nova-logging.conf":
content => template('nova/logging.conf.erb'),
path => "/etc/nova/logging.conf",
owner => "nova",
group => "nova",
require => [Package['nova-common']]
}
##TODO: Add rsyslog module for nova logging to <splunkhost>
}
else {
nova_config {
@ -211,7 +211,7 @@ else {
}
nova_config { 'DEFAULT/allow_resize_to_same_host': value => 'True' }
nova_config { 'DEFAULT/image_service': value => $image_service }
if $image_service == 'nova.image.glance.GlanceImageService' {
if $glance_api_servers {
nova_config { 'DEFAULT/glance_api_servers': value => $glance_api_servers }

21
deployment/puppet/nova/templates/logging.conf.erb Normal file
View File

@ -0,0 +1,21 @@
[loggers]
keys = root
[handlers]
keys = syslog
[formatters]
keys = default
[logger_root]
level = DEBUG
handlers = syslog
qualname = nova
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL0)
formatter = default
[formatter_default]
format = nova %(name)s %(levelname)s %(message)s

77
deployment/puppet/quantum/files/logging.conf
View File

@ -1,77 +0,0 @@
[loggers]
keys = root, quantum
[handlers]
keys = stderr, stdout, watchedfile, syslog, null
[formatters]
keys = legacyquantum, default
[logger_root]
level = WARNING
handlers = null
[logger_quantum]
level = DEBUG
handlers = syslog
qualname = quantum
[logger_amqplib]
level = WARNING
handlers = stderr
qualname = amqplib
[logger_sqlalchemy]
level = WARNING
handlers = stderr
qualname = sqlalchemy
# "level = INFO" logs SQL queries.
# "level = DEBUG" logs SQL queries and results.
# "level = WARNING" logs neither. (Recommended for production systems.)
[logger_boto]
level = WARNING
handlers = stderr
qualname = boto
[logger_suds]
level = INFO
handlers = stderr
qualname = suds
[logger_eventletwsgi]
level = WARNING
handlers = stderr
qualname = eventlet.wsgi.server
[handler_stderr]
class = StreamHandler
args = (sys.stderr,)
formatter = legacyquantum
[handler_stdout]
class = StreamHandler
args = (sys.stdout,)
formatter = legacyquantum
[handler_watchedfile]
class = handlers.WatchedFileHandler
args = ('/var/log/quantum/quantum.log',)
formatter = legacyquantum
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL4)
formatter = legacyquantum
[handler_null]
class = quantum.openstack.common.log.NullHandler
formatter = default
args = ()
[formatter_legacyquantum]
class = quantum.openstack.common.log.LegacyFormatter
[formatter_default]
format = %(message)s

2
deployment/puppet/quantum/manifests/init.pp
View File

@ -91,7 +91,7 @@ class quantum (
if $use_syslog {
quantum_config {'DEFAULT/log_config': value => "/etc/quantum/logging.conf";}
file { "quantum-logging.conf":
source=>"puppet:///modules/quantum/logging.conf",
content => template('quantum/logging.conf.erb'),
path => "/etc/quantum/logging.conf",
owner => "quantum",
group => "quantum",

21
deployment/puppet/quantum/templates/logging.conf.erb Normal file
View File

@ -0,0 +1,21 @@
[loggers]
keys = root
[handlers]
keys = syslog
[formatters]
keys = default
[logger_root]
level = DEBUG
handlers = syslog
qualname = quantum
[handler_syslog]
class = handlers.SysLogHandler
args = ('/dev/log', handlers.SysLogHandler.LOG_LOCAL4)
formatter = default
[formatter_default]
format = quantum %(name)s %(levelname)s %(message)s