# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-07-25 13:07:43
# Node ID cbfb9e8953b11e0ca5e17995ffa0479b60227dfe
# Parent  4c6e1090086aff5d5c99b023d3489dd10d5b3f43

auth: improve logging

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -872,20 +872,20 @@ class AuthUser(object):
 
         # lookup by userid
         if self.user_id is not None and self.user_id != anon_user.user_id:
-            log.debug('Trying Auth User lookup by USER ID: `%s`' % self.user_id)
+            log.debug('Trying Auth User lookup by USER ID: `%s`', self.user_id)
             is_user_loaded = user_model.fill_data(self, user_id=self.user_id)
 
         # try go get user by api key
         elif self._api_key and self._api_key != anon_user.api_key:
-            log.debug('Trying Auth User lookup by API KEY: `%s`' % self._api_key)
+            log.debug('Trying Auth User lookup by API KEY: `%s`', self._api_key)
             is_user_loaded = user_model.fill_data(self, api_key=self._api_key)
 
         # lookup by username
         elif self.username:
-            log.debug('Trying Auth User lookup by USER NAME: `%s`' % self.username)
+            log.debug('Trying Auth User lookup by USER NAME: `%s`', self.username)
             is_user_loaded = user_model.fill_data(self, username=self.username)
         else:
-            log.debug('No data in %s that could been used to log in' % self)
+            log.debug('No data in %s that could been used to log in', self)
 
         if not is_user_loaded:
             log.debug('Failed to load user. Fallback to default user')
@@ -904,7 +904,7 @@ class AuthUser(object):
         if not self.username:
             self.username = 'None'
 
-        log.debug('AuthUser: propagated user is now %s' % self)
+        log.debug('AuthUser: propagated user is now %s', self)
 
     def get_perms(self, user, scope=None, explicit=True, algo='higherwin',
                   cache=False):
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -656,8 +656,8 @@ class UserModel(BaseModel):
             raise Exception('You need to pass user_id, api_key or username')
 
         log.debug(
-            'doing fill data based on: user_id:%s api_key:%s username:%s',
-            user_id, api_key, username)
+            'AuthUser: fill data execution based on: '
+            'user_id:%s api_key:%s username:%s', user_id, api_key, username)
         try:
             dbuser = None
             if user_id:
@@ -677,7 +677,7 @@ class UserModel(BaseModel):
                           username, user_id)
                 return False
 
-            log.debug('filling user:%s data', dbuser)
+            log.debug('AuthUser: filling found user:%s data', dbuser)
             user_data = dbuser.get_dict()
 
             user_data.update({