x/python-ganttclient
Code Issues Proposed changes

Final few log tweaks, i18n, levels, including contexts, etc.

Browse Source
This commit is contained in:
Todd Willey
2011-01-04 00:26:41 -05:00
parent 0799e9ac68
commit 80c7e89f3e
6 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/nova-dhcpbridge
View File

@@ -49,16 +49,13 @@ flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager') flags.DECLARE('num_networks', 'nova.network.manager')
flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager') flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
LOG = logging.getLogger('nova.dhcpbridge')
LOG = logging.getLogger('nova-dhcpbridge')
if FLAGS.verbose:
LOG.setLevel(logging.DEBUG)
def add_lease(mac, ip_address, _hostname, _interface): def add_lease(mac, ip_address, _hostname, _interface):
"""Set the IP that was assigned by the DHCP server.""" """Set the IP that was assigned by the DHCP server."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
LOG.debug("leasing ip") LOG.debug(_("leasing ip"))
network_manager = utils.import_object(FLAGS.network_manager) network_manager = utils.import_object(FLAGS.network_manager)
network_manager.lease_fixed_ip(context.get_admin_context(), network_manager.lease_fixed_ip(context.get_admin_context(),
mac, mac,
@@ -73,14 +70,14 @@ def add_lease(mac, ip_address, _hostname, _interface):
def old_lease(mac, ip_address, hostname, interface): def old_lease(mac, ip_address, hostname, interface):
"""Update just as add lease.""" """Update just as add lease."""
LOG.debug("Adopted old lease or got a change of mac/hostname") LOG.debug(_("Adopted old lease or got a change of mac/hostname"))
add_lease(mac, ip_address, hostname, interface) add_lease(mac, ip_address, hostname, interface)
def del_lease(mac, ip_address, _hostname, _interface): def del_lease(mac, ip_address, _hostname, _interface):
"""Called when a lease expires.""" """Called when a lease expires."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
LOG.debug("releasing ip") LOG.debug(_("releasing ip"))
network_manager = utils.import_object(FLAGS.network_manager) network_manager = utils.import_object(FLAGS.network_manager)
network_manager.release_fixed_ip(context.get_admin_context(), network_manager.release_fixed_ip(context.get_admin_context(),
mac, mac,
@@ -123,8 +120,8 @@ def main():
mac = argv[2] mac = argv[2]
ip = argv[3] ip = argv[3]
hostname = argv[4] hostname = argv[4]
LOG.debug("Called %s for mac %s with ip %s and " LOG.debug(_("Called %s for mac %s with ip %s and "
"hostname %s on interface %s", "hostname %s on interface %s"),
action, mac, ip, hostname, interface) action, mac, ip, hostname, interface)
globals()[action + '_lease'](mac, ip, hostname, interface) globals()[action + '_lease'](mac, ip, hostname, interface)
else: else:

2
bin/nova-instancemonitor
View File

@@ -44,7 +44,7 @@ from nova.compute import monitor
# TODO(todd): shouldn't this be done with flags? And what about verbose? # TODO(todd): shouldn't this be done with flags? And what about verbose?
logging.getLogger('boto').setLevel(logging.WARN) logging.getLogger('boto').setLevel(logging.WARN)
LOG = logging.getLogger('nova-instancemonitor') LOG = logging.getLogger('nova.instancemonitor')
if __name__ == '__main__': if __name__ == '__main__':

2
bin/nova-manage
View File

@@ -77,7 +77,6 @@ from nova import crypto
from nova import db from nova import db
from nova import exception from nova import exception
from nova import flags from nova import flags
from nova import log as logging
from nova import quota from nova import quota
from nova import utils from nova import utils
from nova.auth import manager from nova.auth import manager
@@ -557,7 +556,6 @@ def main():
utils.default_flagfile() utils.default_flagfile()
argv = FLAGS(sys.argv) argv = FLAGS(sys.argv)
logging._set_log_levels()
script_name = argv.pop(0) script_name = argv.pop(0)
if len(argv) < 1: if len(argv) < 1:
print script_name + " category action [<args>]" print script_name + " category action [<args>]"

3
nova/auth/ldapdriver.py
View File

@@ -65,7 +65,6 @@ flags.DEFINE_string('ldap_netadmin',
flags.DEFINE_string('ldap_developer', flags.DEFINE_string('ldap_developer',
'cn=developers,ou=Groups,dc=example,dc=com', 'cn for Developers') 'cn=developers,ou=Groups,dc=example,dc=com', 'cn for Developers')
LOG = logging.getLogger("nova.ldapdriver") LOG = logging.getLogger("nova.ldapdriver")
@@ -506,7 +505,7 @@ class LdapDriver(object):
self.conn.modify_s(group_dn, attr) self.conn.modify_s(group_dn, attr)
except self.ldap.OBJECT_CLASS_VIOLATION: except self.ldap.OBJECT_CLASS_VIOLATION:
LOG.debug(_("Attempted to remove the last member of a group. " LOG.debug(_("Attempted to remove the last member of a group. "
"Deleting the group at %s instead."), group_dn) "Deleting the group at %s instead."), group_dn)
self.__delete_group(group_dn) self.__delete_group(group_dn)
def __remove_from_all(self, uid): def __remove_from_all(self, uid):

3
nova/auth/manager.py
View File

@@ -70,8 +70,7 @@ flags.DEFINE_string('credential_rc_file', '%src',
flags.DEFINE_string('auth_driver', 'nova.auth.dbdriver.DbDriver', flags.DEFINE_string('auth_driver', 'nova.auth.dbdriver.DbDriver',
'Driver that auth manager uses') 'Driver that auth manager uses')
LOG = logging.getLogger('nova.auth.manager')
LOG = logging.getLogger('nova.authmanager')
class AuthBase(object): class AuthBase(object):

5
nova/rpc.py
View File

@@ -96,8 +96,9 @@ class Consumer(messaging.Consumer):
FLAGS.rabbit_retry_interval)) FLAGS.rabbit_retry_interval))
self.failed_connection = True self.failed_connection = True
if self.failed_connection: if self.failed_connection:
LOG.exception(_("Unable to connect to AMQP server" LOG.exception(_("Unable to connect to AMQP server "
" after %d tries. Shutting down.") % FLAGS.rabbit_max_retries) "after %d tries. Shutting down."),
FLAGS.rabbit_max_retries)
sys.exit(1) sys.exit(1)
def fetch(self, no_ack=None, auto_ack=None, enable_callbacks=False): def fetch(self, no_ack=None, auto_ack=None, enable_callbacks=False):