Mercurial > kallithea
changeset 3634:336184b9f4cf beta
fix unicode issues on logging in SCM middlewares
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 29 Mar 2013 23:33:02 +0100 |
parents | 5917256510d7 |
children | be78bf3b1a1f |
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 Thu Mar 28 04:03:10 2013 +0100 +++ b/rhodecode/lib/middleware/simplegit.py Fri Mar 29 23:33:02 2013 +0100 @@ -206,7 +206,8 @@ #=================================================================== # GIT REQUEST HANDLING #=================================================================== - repo_path = os.path.join(safe_str(self.basepath), safe_str(repo_name)) + str_repo_name = safe_str(repo_name) + repo_path = os.path.join(safe_str(self.basepath),str_repo_name) log.debug('Repository path is %s' % repo_path) # CHECK LOCKING only if it's not ANONYMOUS USER @@ -231,7 +232,7 @@ try: self._handle_githooks(repo_name, action, baseui, environ) log.info('%s action on GIT repo "%s" by "%s" from %s' % - (action, repo_name, username, ip_addr)) + (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_name, repo_path, extras) return app(environ, start_response) except HTTPLockedRC, e:
--- a/rhodecode/lib/middleware/simplehg.py Thu Mar 28 04:03:10 2013 +0100 +++ b/rhodecode/lib/middleware/simplehg.py Fri Mar 29 23:33:02 2013 +0100 @@ -168,7 +168,8 @@ #====================================================================== # MERCURIAL REQUEST HANDLING #====================================================================== - repo_path = os.path.join(safe_str(self.basepath), safe_str(repo_name)) + str_repo_name = safe_str(repo_name) + repo_path = os.path.join(safe_str(self.basepath), str_repo_name) log.debug('Repository path is %s' % repo_path) # CHECK LOCKING only if it's not ANONYMOUS USER @@ -193,7 +194,7 @@ try: log.info('%s action on HG repo "%s" by "%s" from %s' % - (action, repo_name, username, ip_addr)) + (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_path, baseui, extras) return app(environ, start_response) except RepoError, e: