diff options
| author | Karel Klic <kklic@redhat.com> | 2011-01-21 12:16:03 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2011-01-21 12:16:03 +0100 |
| commit | 8ab8628ead5ac4d242afdcd86f5bb8a74a2d9b5a (patch) | |
| tree | b1950e12df5aaf4399b650c7e5c26fee9aeacd25 | |
| parent | d24d799e4e60fbe050d775580fd60a7663f1e0cf (diff) | |
Allow accessing log without trailing '/'; update httpd patch matchers
| -rw-r--r-- | retrace/config/retrace_httpd.conf | 6 | ||||
| -rw-r--r-- | retrace/lib/retrace.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/retrace/config/retrace_httpd.conf b/retrace/config/retrace_httpd.conf index 8a30e9ea..a18d82ff 100644 --- a/retrace/config/retrace_httpd.conf +++ b/retrace/config/retrace_httpd.conf @@ -1,4 +1,4 @@ WSGIScriptAliasMatch ^/create$ /usr/share/abrt-retrace/create.wsgi -WSGIScriptAliasMatch ^/[0-9a-zA-Z]+/$ /usr/share/abrt-retrace/status.wsgi -WSGIScriptAliasMatch ^/[0-9a-zA-Z]+/log$ /usr/share/abrt-retrace/log.wsgi -WSGIScriptAliasMatch ^/[0-9a-zA-Z]+/backtrace$ /usr/share/abrt-retrace/backtrace.wsgi +WSGIScriptAliasMatch ^/[0-9]+$ /usr/share/abrt-retrace/status.wsgi +WSGIScriptAliasMatch ^/[0-9]+/log$ /usr/share/abrt-retrace/log.wsgi +WSGIScriptAliasMatch ^/[0-9]+/backtrace$ /usr/share/abrt-retrace/backtrace.wsgi diff --git a/retrace/lib/retrace.py b/retrace/lib/retrace.py index 840d7761..d14bda70 100644 --- a/retrace/lib/retrace.py +++ b/retrace/lib/retrace.py @@ -18,7 +18,7 @@ TASKID_PARSER = re.compile("^.*/([0-9]+)/*$") PACKAGE_PARSER = re.compile("^(.+)-([0-9]+(\.[0-9]+)*-[0-9]+)\.([^-]+)$") DF_OUTPUT_PARSER = re.compile("^([^ ^\t]*)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+%)[ \t]+(.*)$") XZ_OUTPUT_PARSER = re.compile("^totals[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+\.[0-9]+)[ \t]+([^ ^\t]+)[ \t]+([0-9]+)") -URL_PARSER = re.compile("^/([0-9]+)/") +URL_PARSER = re.compile("^/([0-9]+)/?") RELEASE_PARSERS = { "fedora": re.compile("^Fedora[^0-9]+([0-9]+)[^\(]\(([^\)]+)\)$"), } @@ -185,4 +185,4 @@ def save_crashstats(crashstats): return False ### read config on import ### -read_config()
\ No newline at end of file +read_config() |