##// END OF EJS Templates
fix unicode issues on logging in SCM middlewares
marcink -
r3634:336184b9 beta
parent child Browse files
Show More
@@ -206,7 +206,8 b' class SimpleGit(BaseVCSController):'
206 #===================================================================
206 #===================================================================
207 # GIT REQUEST HANDLING
207 # GIT REQUEST HANDLING
208 #===================================================================
208 #===================================================================
209 repo_path = os.path.join(safe_str(self.basepath), safe_str(repo_name))
209 str_repo_name = safe_str(repo_name)
210 repo_path = os.path.join(safe_str(self.basepath),str_repo_name)
210 log.debug('Repository path is %s' % repo_path)
211 log.debug('Repository path is %s' % repo_path)
211
212
212 # CHECK LOCKING only if it's not ANONYMOUS USER
213 # CHECK LOCKING only if it's not ANONYMOUS USER
@@ -231,7 +232,7 b' class SimpleGit(BaseVCSController):'
231 try:
232 try:
232 self._handle_githooks(repo_name, action, baseui, environ)
233 self._handle_githooks(repo_name, action, baseui, environ)
233 log.info('%s action on GIT repo "%s" by "%s" from %s' %
234 log.info('%s action on GIT repo "%s" by "%s" from %s' %
234 (action, repo_name, username, ip_addr))
235 (action, str_repo_name, safe_str(username), ip_addr))
235 app = self.__make_app(repo_name, repo_path, extras)
236 app = self.__make_app(repo_name, repo_path, extras)
236 return app(environ, start_response)
237 return app(environ, start_response)
237 except HTTPLockedRC, e:
238 except HTTPLockedRC, e:
@@ -168,7 +168,8 b' class SimpleHg(BaseVCSController):'
168 #======================================================================
168 #======================================================================
169 # MERCURIAL REQUEST HANDLING
169 # MERCURIAL REQUEST HANDLING
170 #======================================================================
170 #======================================================================
171 repo_path = os.path.join(safe_str(self.basepath), safe_str(repo_name))
171 str_repo_name = safe_str(repo_name)
172 repo_path = os.path.join(safe_str(self.basepath), str_repo_name)
172 log.debug('Repository path is %s' % repo_path)
173 log.debug('Repository path is %s' % repo_path)
173
174
174 # CHECK LOCKING only if it's not ANONYMOUS USER
175 # CHECK LOCKING only if it's not ANONYMOUS USER
@@ -193,7 +194,7 b' class SimpleHg(BaseVCSController):'
193
194
194 try:
195 try:
195 log.info('%s action on HG repo "%s" by "%s" from %s' %
196 log.info('%s action on HG repo "%s" by "%s" from %s' %
196 (action, repo_name, username, ip_addr))
197 (action, str_repo_name, safe_str(username), ip_addr))
197 app = self.__make_app(repo_path, baseui, extras)
198 app = self.__make_app(repo_path, baseui, extras)
198 return app(environ, start_response)
199 return app(environ, start_response)
199 except RepoError, e:
200 except RepoError, e:
General Comments 0
You need to be logged in to leave comments. Login now