From 6f5d69e7b5b52f9c407e0ca83231778a42a48722 Mon Sep 17 00:00:00 2001 From: Jay Payne Date: Sat, 29 Jan 2011 16:43:02 +0000 Subject: [PATCH 1/7] listing is a tuple correcting reference rv[1] --- swift/common/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/common/client.py b/swift/common/client.py index bf402adb76..1fffaa493d 100644 --- a/swift/common/client.py +++ b/swift/common/client.py @@ -222,7 +222,7 @@ def get_account(url, token, marker=None, limit=None, prefix=None, listing = \ get_account(url, token, marker, limit, prefix, http_conn)[1] if listing: - rv.extend(listing) + rv[1].extend(listing) return rv parsed, conn = http_conn qs = 'format=json' From a5d31b0d3a6206e14d3e55f37c43815fd309ad51 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Sun, 30 Jan 2011 08:59:35 -0600 Subject: [PATCH 2/7] removed extra import in account stats logger --- swift/stats/account_stats.py | 1 - 1 file changed, 1 deletion(-) diff --git a/swift/stats/account_stats.py b/swift/stats/account_stats.py index 6a9688831f..325746386c 100644 --- a/swift/stats/account_stats.py +++ b/swift/stats/account_stats.py @@ -21,7 +21,6 @@ import hashlib from swift.account.server import DATADIR as account_server_data_dir from swift.common.db import AccountBroker -from swift.common.internal_proxy import InternalProxy from swift.common.utils import renamer, get_logger, readconf, mkdirs from swift.common.constraints import check_mount from swift.common.daemon import Daemon From f457d772fbe3c9b9603eb809a5c1c4e6f7636514 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Tue, 1 Feb 2011 15:48:46 -0600 Subject: [PATCH 3/7] Bumping version to 1.2-rc --- swift/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/__init__.py b/swift/__init__.py index 316208f929..9e4b1ee0cd 100644 --- a/swift/__init__.py +++ b/swift/__init__.py @@ -1,5 +1,5 @@ import gettext -__version__ = '1.2-gamma' +__version__ = '1.2-rc' gettext.install('swift') From fdf20184e47383505865580560235af83ef9c35f Mon Sep 17 00:00:00 2001 From: gholt Date: Wed, 2 Feb 2011 09:38:17 -0800 Subject: [PATCH 4/7] Fix duplicate logging --- swift/common/utils.py | 1 + test/unit/common/test_daemon.py | 4 ++-- test/unit/common/test_utils.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/swift/common/utils.py b/swift/common/utils.py index 479c4ecc30..a207153a74 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -409,6 +409,7 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None): logger = logging.getLogger() else: logger = logging.getLogger(log_route) + logger.propagate = False if not hasattr(get_logger, 'handlers'): get_logger.handlers = {} facility = getattr(SysLogHandler, conf.get('log_facility', 'LOG_LOCAL0'), diff --git a/test/unit/common/test_daemon.py b/test/unit/common/test_daemon.py index 015928f670..a4addcee51 100644 --- a/test/unit/common/test_daemon.py +++ b/test/unit/common/test_daemon.py @@ -28,7 +28,7 @@ class MyDaemon(daemon.Daemon): def __init__(self, conf): self.conf = conf - self.logger = utils.get_logger(None) + self.logger = utils.get_logger(None, 'server') MyDaemon.forever_called = False MyDaemon.once_called = False @@ -97,7 +97,7 @@ user = %s # test user quit MyDaemon.run_forever = MyDaemon.run_quit sio = StringIO() - logger = logging.getLogger() + logger = logging.getLogger('server') logger.addHandler(logging.StreamHandler(sio)) logger = utils.get_logger(None, 'server') daemon.run_daemon(MyDaemon, conf_file, logger=logger) diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 94257415f1..0c81b15698 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -287,7 +287,7 @@ Error: unable to locate %s def test_get_logger(self): sio = StringIO() - logger = logging.getLogger() + logger = logging.getLogger('server') logger.addHandler(logging.StreamHandler(sio)) logger = utils.get_logger(None, 'server') logger.warn('test1') From 812fe86ea8108231039a5dbb06901f3de6bd71fb Mon Sep 17 00:00:00 2001 From: gholt Date: Wed, 2 Feb 2011 10:23:01 -0800 Subject: [PATCH 5/7] Make swauth only log requests it handles --- swift/common/middleware/swauth.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swift/common/middleware/swauth.py b/swift/common/middleware/swauth.py index 3399fd06a4..5965e710ac 100644 --- a/swift/common/middleware/swauth.py +++ b/swift/common/middleware/swauth.py @@ -1321,6 +1321,8 @@ class Swauth(object): return False def posthooklogger(self, env, req): + if not req.path.startswith(self.auth_prefix): + return response = getattr(req, 'response', None) if not response: return From ee794fa79c95d3c9ee6eb8dd1ff0d00dd8165e8d Mon Sep 17 00:00:00 2001 From: gholt Date: Wed, 2 Feb 2011 10:47:56 -0800 Subject: [PATCH 6/7] logging: Remove old handler before installing a new handler --- swift/common/utils.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/swift/common/utils.py b/swift/common/utils.py index a207153a74..8da3d1f8f4 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -410,28 +410,34 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None): else: logger = logging.getLogger(log_route) logger.propagate = False - if not hasattr(get_logger, 'handlers'): - get_logger.handlers = {} + if not hasattr(get_logger, 'handler4facility'): + get_logger.handler4facility = {} facility = getattr(SysLogHandler, conf.get('log_facility', 'LOG_LOCAL0'), SysLogHandler.LOG_LOCAL0) - if facility in get_logger.handlers: - logger.removeHandler(get_logger.handlers[facility]) - get_logger.handlers[facility].close() - del get_logger.handlers[facility] + if facility in get_logger.handler4facility: + logger.removeHandler(get_logger.handler4facility[facility]) + get_logger.handler4facility[facility].close() + del get_logger.handler4facility[facility] if log_to_console: # check if a previous call to get_logger already added a console logger if hasattr(get_logger, 'console') and get_logger.console: logger.removeHandler(get_logger.console) get_logger.console = logging.StreamHandler(sys.__stderr__) logger.addHandler(get_logger.console) - get_logger.handlers[facility] = \ + get_logger.handler4facility[facility] = \ SysLogHandler(address='/dev/log', facility=facility) - logger.addHandler(get_logger.handlers[facility]) + if not hasattr(get_logger, 'handler4logger'): + get_logger.handler4logger = {} + if logger in get_logger.handler4logger: + logger.removeHandler(get_logger.handler4logger[logger]) + get_logger.handler4logger[logger] = \ + get_logger.handler4facility[facility] + logger.addHandler(get_logger.handler4facility[facility]) logger.setLevel( getattr(logging, conf.get('log_level', 'INFO').upper(), logging.INFO)) adapted_logger = LogAdapter(logger) formatter = NamedFormatter(name, adapted_logger) - get_logger.handlers[facility].setFormatter(formatter) + get_logger.handler4facility[facility].setFormatter(formatter) if hasattr(get_logger, 'console'): get_logger.console.setFormatter(formatter) return adapted_logger From bf34239d79cc78cafa138f02fcde327ea4db69c1 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Wed, 2 Feb 2011 22:37:55 +0000 Subject: [PATCH 7/7] Bumping version to 1.2.0 in preparation for release --- swift/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/__init__.py b/swift/__init__.py index 9e4b1ee0cd..899047889e 100644 --- a/swift/__init__.py +++ b/swift/__init__.py @@ -1,5 +1,5 @@ import gettext -__version__ = '1.2-rc' +__version__ = '1.2.0' gettext.install('swift')