summaryrefslogtreecommitdiffstats
path: root/gluster/swift/common/middleware
diff options
context:
space:
mode:
authorThiago da Silva <thiago@redhat.com>2013-11-05 14:32:59 -0500
committerLuis Pabon <lpabon@redhat.com>2013-11-15 19:57:13 -0800
commit870a6e622688a69f7f13f7ddcfee2318c5c3cb76 (patch)
tree3cc0b8641f89a2a55e125e76b627e9b42e99564a /gluster/swift/common/middleware
parent477b4a9e560ebcda9ea91e3e03169a0c741f293b (diff)
renaming instances of swauth to gswauth
changed code where appropriate to gswauth instead of swauth Change-Id: Iadcec4f379fae3f063379b4899797b375290cc7b Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6226 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com> Reviewed-on: http://review.gluster.org/6278
Diffstat (limited to 'gluster/swift/common/middleware')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index c7f92f9..0a1c808 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
@@ -55,7 +55,7 @@ class Swauth(object):
def __init__(self, app, conf):
self.app = app
self.conf = conf
- self.logger = get_logger(conf, log_route='swauth')
+ self.logger = get_logger(conf, log_route='gswauth')
self.log_headers = conf.get('log_headers', 'no').lower() in TRUE_VALUES
self.reseller_prefix = conf.get('reseller_prefix', 'AUTH').strip()
if self.reseller_prefix and self.reseller_prefix[-1] != '_':
@@ -144,7 +144,7 @@ class Swauth(object):
raise Exception(
'Invalid auth_type in config file: %s'
% self.auth_type)
- self.auth_encoder.salt = conf.get('auth_type_salt', 'swauthsalt')
+ self.auth_encoder.salt = conf.get('auth_type_salt', 'gswauthsalt')
self.allow_overrides = \
conf.get('allow_overrides', 't').lower() in TRUE_VALUES
self.agent = '%(orig)s Swauth'