aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Kiilerich <madski@unity3d.com>2013-01-02 13:54:26 +0100
committerMads Kiilerich <madski@unity3d.com>2013-01-02 13:54:26 +0100
commit775fdadfcedd0dfd2ad067eefdfdd81020caa7a7 (patch)
tree5750de1155acd825ad26b0276f01e4a67c2c9324
parentf277156f461b833a0137fc95846fbdc54ebc90ac (diff)
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. --HG-- branch : beta
-rw-r--r--rhodecode/lib/middleware/simplegit.py5
-rw-r--r--rhodecode/lib/middleware/simplehg.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py
index 1dedf17b..e35f95ae 100644
--- a/rhodecode/lib/middleware/simplegit.py
+++ b/rhodecode/lib/middleware/simplegit.py
@@ -233,11 +233,12 @@ class SimpleGit(BaseVCSController):
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())
diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py
index 2a6ea397..5d2ef692 100644
--- a/rhodecode/lib/middleware/simplehg.py
+++ b/rhodecode/lib/middleware/simplehg.py
@@ -194,14 +194,15 @@ class SimpleHg(BaseVCSController):
# 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())