##// END OF EJS Templates
logging: changed module in logs extra as it is a reserved keyword
super-admin -
r4818:6ebd323b default
parent child Browse files
Show More
@@ -223,7 +223,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
223 }
223 }
224
224
225 log.info('user `%s` authenticated correctly', user_attrs['username'],
225 log.info('user `%s` authenticated correctly', user_attrs['username'],
226 extra={"action": "user_auth_ok", "module": "auth_headers", "username": user_attrs["username"]})
226 extra={"action": "user_auth_ok", "auth_module": "auth_headers", "username": user_attrs["username"]})
227 return user_attrs
227 return user_attrs
228
228
229
229
@@ -535,7 +535,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
535
535
536 log.debug('ldap user: %s', user_attrs)
536 log.debug('ldap user: %s', user_attrs)
537 log.info('user `%s` authenticated correctly', user_attrs['username'],
537 log.info('user `%s` authenticated correctly', user_attrs['username'],
538 extra={"action": "user_auth_ok", "module": "auth_ldap", "username": user_attrs["username"]})
538 extra={"action": "user_auth_ok", "auth_module": "auth_ldap", "username": user_attrs["username"]})
539
539
540 return user_attrs
540 return user_attrs
541
541
@@ -163,7 +163,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
163
163
164 log.debug("pamuser: %s", user_attrs)
164 log.debug("pamuser: %s", user_attrs)
165 log.info('user `%s` authenticated correctly', user_attrs['username'],
165 log.info('user `%s` authenticated correctly', user_attrs['username'],
166 extra={"action": "user_auth_ok", "module": "auth_pam", "username": user_attrs["username"]})
166 extra={"action": "user_auth_ok", "auth_module": "auth_pam", "username": user_attrs["username"]})
167 return user_attrs
167 return user_attrs
168
168
169
169
@@ -168,12 +168,12 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
168 if userobj.username == User.DEFAULT_USER and userobj.active:
168 if userobj.username == User.DEFAULT_USER and userobj.active:
169 log.info('user `%s` authenticated correctly as anonymous user',
169 log.info('user `%s` authenticated correctly as anonymous user',
170 userobj.username,
170 userobj.username,
171 extra={"action": "user_auth_ok", "module": "auth_rhodecode_anon", "username": userobj.username})
171 extra={"action": "user_auth_ok", "auth_module": "auth_rhodecode_anon", "username": userobj.username})
172 return user_attrs
172 return user_attrs
173
173
174 elif userobj.username == username and password_match:
174 elif userobj.username == username and password_match:
175 log.info('user `%s` authenticated correctly', userobj.username,
175 log.info('user `%s` authenticated correctly', userobj.username,
176 extra={"action": "user_auth_ok", "module": "auth_rhodecode", "username": userobj.username})
176 extra={"action": "user_auth_ok", "auth_module": "auth_rhodecode", "username": userobj.username})
177 return user_attrs
177 return user_attrs
178 log.warning("user `%s` used a wrong password when "
178 log.warning("user `%s` used a wrong password when "
179 "authenticating on this plugin", userobj.username)
179 "authenticating on this plugin", userobj.username)
General Comments 0
You need to be logged in to leave comments. Login now