Mercurial > kallithea

changeset 3135:e7ba69286276 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
logging: include more info in action logging These messages are very frequent and thus shows what is going on on the server - and it is nice to have some extra information to give some context for other messages that might be logged.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Jan 2013 13:54:26 +0100
parents ff315659d289
children c9844213a9d8
files rhodecode/lib/middleware/simplegit.py rhodecode/lib/middleware/simplehg.py
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/middleware/simplegit.py	Wed Jan 02 13:54:24 2013 +0100
+++ b/rhodecode/lib/middleware/simplegit.py	Wed Jan 02 13:54:26 2013 +0100
@@ -233,11 +233,12 @@
                 self._invalidate_cache(repo_name)
             self._handle_githooks(repo_name, action, baseui, environ)
 
-            log.info('%s action on GIT repo "%s"' % (action, repo_name))
+            log.info('%s action on GIT repo "%s" by "%s" from %s' %
+                     (action, repo_name, username, ip_addr))
             app = self.__make_app(repo_name, repo_path, extras)
             return app(environ, start_response)
         except HTTPLockedRC, e:
-            log.debug('Repositry LOCKED ret code 423!')
+            log.debug('Repository LOCKED ret code 423!')
             return e(environ, start_response)
         except Exception:
             log.error(traceback.format_exc())
--- a/rhodecode/lib/middleware/simplehg.py	Wed Jan 02 13:54:24 2013 +0100
+++ b/rhodecode/lib/middleware/simplehg.py	Wed Jan 02 13:54:26 2013 +0100
@@ -194,14 +194,15 @@
             # invalidate cache on push
             if action == 'push':
                 self._invalidate_cache(repo_name)
-            log.info('%s action on HG repo "%s"' % (action, repo_name))
+            log.info('%s action on HG repo "%s" by "%s" from %s' %
+                     (action, repo_name, username, ip_addr))
             app = self.__make_app(repo_path, baseui, extras)
             return app(environ, start_response)
         except RepoError, e:
             if str(e).find('not found') != -1:
                 return HTTPNotFound()(environ, start_response)
         except HTTPLockedRC, e:
-            log.debug('Repositry LOCKED ret code 423!')
+            log.debug('Repository LOCKED ret code 423!')
             return e(environ, start_response)
         except Exception:
             log.error(traceback.format_exc())