kallithea Changeset - 7e979933ffec

Changeset - 7e979933ffec

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2012-02-23 02:39:35
marcin@python-works.com

more work on improving info logging

5 files changed with 20 insertions and 13 deletions:

rhodecode/__init__.py

rhodecode/lib/auth.py

rhodecode/lib/base.py

rhodecode/lib/vcs/utils/__init__.py

rhodecode/model/forms.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -89,4 +89,4 @@ BACKENDS = { @@
 CELERY_ON = False
 # link to config for pylons
-CONFIG = None
+CONFIG = {}

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -173,7 +173,7 @@ def authenticate(username, password): @@
     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 @@ def authenticate(username, password): @@
                 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 @@ class LoginRequired(object): @@
                 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 @@ class PermsDecorator(object): @@
             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 @@ class PermsFunction(object): @@
             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

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -147,9 +147,12 @@ class BaseController(WSGIController): @@
             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()

rhodecode/lib/vcs/utils/__init__.py

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ def safe_unicode(str_, from_encoding=Non @@
         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 @@ def safe_str(unicode_, to_encoding=None) @@
         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)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -256,7 +256,7 @@ class ValidAuth(formencode.validators.Fa @@
                     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,

0 comments (0 inline, 0 general)