Mercurial > kallithea
changeset 2025:7e979933ffec beta
more work on improving info logging
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 23 Feb 2012 03:39:35 +0200 |
| parents | 370e995e46c2 |
| children | c6e288dcb4a2 |
| files | rhodecode/__init__.py rhodecode/lib/auth.py rhodecode/lib/base.py rhodecode/lib/vcs/utils/__init__.py rhodecode/model/forms.py |
| diffstat | 5 files changed, 20 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/__init__.py Thu Feb 23 02:48:32 2012 +0200 +++ b/rhodecode/__init__.py Thu Feb 23 03:39:35 2012 +0200 @@ -89,4 +89,4 @@ CELERY_ON = False # link to config for pylons -CONFIG = None +CONFIG = {}
--- a/rhodecode/lib/auth.py Thu Feb 23 02:48:32 2012 +0200 +++ b/rhodecode/lib/auth.py Thu Feb 23 03:39:35 2012 +0200 @@ -173,7 +173,7 @@ if user is not None and not user.ldap_dn: if user.active: if user.username == 'default' and user.active: - log.info('user %s authenticated correctly as anonymous user', + log.info('user %s authenticated correctly as anonymous user' % username) return True @@ -182,7 +182,7 @@ log.info('user %s authenticated correctly' % username) return True else: - log.warning('user %s is disabled' % username) + log.warning('user %s tried auth but is disabled' % username) else: log.debug('Regular authentication failed') @@ -434,13 +434,17 @@ api_access_ok = True else: log.debug("API KEY token not valid") - - log.debug('Checking if %s is authenticated @ %s' % (user.username, cls)) + loc = "%s:%s" % (cls.__class__.__name__, func.__name__) + log.debug('Checking if %s is authenticated @ %s' % (user.username, loc)) if user.is_authenticated or api_access_ok: - log.debug('user %s is authenticated' % user.username) + log.info('user %s is authenticated and granted access to %s' % ( + user.username, loc) + ) return func(*fargs, **fkwargs) else: - log.warn('user %s NOT authenticated' % user.username) + log.warn('user %s NOT authenticated on func: %s' % ( + user, loc) + ) p = url.current() log.debug('redirecting to login page with %s' % p) @@ -502,7 +506,7 @@ return func(*fargs, **fkwargs) else: - log.warning('Permission denied for %s %s' % (cls, self.user)) + log.debug('Permission denied for %s %s' % (cls, self.user)) anonymous = self.user.username == 'default' if anonymous: @@ -649,7 +653,7 @@ return True else: - log.warning('Permission denied for %s @ %s', self.granted_for, + log.debug('Permission denied for %s @ %s', self.granted_for, check_Location or 'unspecified location') return False
--- a/rhodecode/lib/base.py Thu Feb 23 02:48:32 2012 +0200 +++ b/rhodecode/lib/base.py Thu Feb 23 03:39:35 2012 +0200 @@ -147,9 +147,12 @@ session['rhodecode_user'] = self.rhodecode_user.get_cookie_store() session.save() + log.info('User: %s accessed %s' % (auth_user, + environ.get('PATH_INFO'))) return WSGIController.__call__(self, environ, start_response) finally: - log.debug('Request time: %.3fs' % (time.time() - start)) + log.info('Request to %s time: %.3fs' % (environ.get('PATH_INFO'), + time.time() - start)) meta.Session.remove()
--- a/rhodecode/lib/vcs/utils/__init__.py Thu Feb 23 02:48:32 2012 +0200 +++ b/rhodecode/lib/vcs/utils/__init__.py Thu Feb 23 03:39:35 2012 +0200 @@ -42,7 +42,7 @@ return str_ if not from_encoding: import rhodecode - DEFAULT_ENCODING = rhodecode.CONFIG.get('default_encoding','utf8') + DEFAULT_ENCODING = rhodecode.CONFIG.get('default_encoding', 'utf8') from_encoding = DEFAULT_ENCODING try: return unicode(str_) @@ -80,7 +80,7 @@ return unicode_ if not to_encoding: import rhodecode - DEFAULT_ENCODING = rhodecode.CONFIG.get('default_encoding','utf8') + DEFAULT_ENCODING = rhodecode.CONFIG.get('default_encoding', 'utf8') to_encoding = DEFAULT_ENCODING try: return unicode_.encode(to_encoding)
--- a/rhodecode/model/forms.py Thu Feb 23 02:48:32 2012 +0200 +++ b/rhodecode/model/forms.py Thu Feb 23 03:39:35 2012 +0200 @@ -256,7 +256,7 @@ error_dict=self.e_dict_disable ) else: - log.warning('user %s not authenticated' % username) + log.warning('user %s failed to authenticate' % username) raise formencode.Invalid( self.message('invalid_password', state=State_obj), value, state,