kallithea Changeset - 7a5eeafb1a9a

Changeset - 7a5eeafb1a9a

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-20 00:01:06
marcin@python-works.com

better path extraction method.
fixed error document old html

2 files changed with 15 insertions and 5 deletions:

rhodecode/lib/base.py

rhodecode/templates/errors/error_document.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -48,6 +48,14 @@ def _get_ip_addr(environ): @@
     return ip
 def _get_access_path(environ):
     path = environ.get('PATH_INFO')
     org_req = environ.get('pylons.original_request')
     if org_req:
         path = org_req.environ.get('PATH_INFO')
     return path
 class BasicAuth(AuthBasicAuthenticator):
     def __init__(self, realm, authfunc, auth_http_code=None):
@@ @@ -187,13 +195,13 @@ class BaseController(WSGIController): @@
                     cookie_store.get('is_authenticated')
+                )
             log.info('IP: %s User: %s accessed %s' % (
-               self.ip_addr, auth_user, safe_unicode(environ.get('PATH_INFO')))
+               self.ip_addr, auth_user, safe_unicode(_get_access_path(environ)))
+            )
             return WSGIController.__call__(self, environ, start_response)
         finally:
             log.info('IP: %s Request to %s time: %.3fs' % (
                 _get_ip_addr(environ),
-                safe_unicode(environ.get('PATH_INFO')), time.time() - start)
+                safe_unicode(_get_access_path(environ)), time.time() - start)
+            )
             meta.Session.remove()

rhodecode/templates/errors/error_document.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	    %if c.redirect_time:
 	        <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
 	    %endif
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />

0 comments (0 inline, 0 general)