diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-04-03 14:20:31 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-04-03 14:20:31 +0200 |
| commit | f8a7877f5bc93f2acb53130ebf95f0fd1d4766c8 (patch) | |
| tree | bdb989a68f68d07f172f27f8a14f03a164d23067 /src | |
| parent | 7659ebe3a1c5dab07c75ba9f91f4b7a1762043c6 (diff) | |
| parent | 81d6d7dc498260cd378378ba64c46b31654473cf (diff) | |
| download | abrt-f8a7877f5bc93f2acb53130ebf95f0fd1d4766c8.tar.gz abrt-f8a7877f5bc93f2acb53130ebf95f0fd1d4766c8.tar.xz abrt-f8a7877f5bc93f2acb53130ebf95f0fd1d4766c8.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/abrt-action-bugzilla.cpp | 1 | ||||
| -rw-r--r-- | src/retrace/Makefile.am | 2 | ||||
| -rw-r--r-- | src/retrace/retrace_httpd.conf | 1 | ||||
| -rw-r--r-- | src/retrace/settings.wsgi | 21 |
4 files changed, 24 insertions, 1 deletions
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp index e066142b..95aad861 100644 --- a/src/plugins/abrt-action-bugzilla.cpp +++ b/src/plugins/abrt-action-bugzilla.cpp @@ -52,6 +52,7 @@ static void bug_info_init(struct bug_info* bz) bz->bug_reporter = NULL; bz->bug_product = NULL; bz->bug_dup_id = -1; + bz->bug_cc = NULL; } static void bug_info_destroy(struct bug_info* bz) diff --git a/src/retrace/Makefile.am b/src/retrace/Makefile.am index 19971da9..02c81c58 100644 --- a/src/retrace/Makefile.am +++ b/src/retrace/Makefile.am @@ -15,7 +15,7 @@ cleanupdir = $(datadir)/abrt-retrace reposync_PYTHON = abrt-retrace-reposync.py reposyncdir = $(datadir)/abrt-retrace -interface_PYTHON = backtrace.wsgi create.wsgi log.wsgi status.wsgi +interface_PYTHON = backtrace.wsgi create.wsgi log.wsgi settings.wsgi status.wsgi # interfacedir should probably be $$(pkgdatadir)/retrace interfacedir = $(datadir)/abrt-retrace diff --git a/src/retrace/retrace_httpd.conf b/src/retrace/retrace_httpd.conf index b896f86f..bd282471 100644 --- a/src/retrace/retrace_httpd.conf +++ b/src/retrace/retrace_httpd.conf @@ -1,3 +1,4 @@ +WSGIScriptAliasMatch ^/settings$ /usr/share/abrt-retrace/settings.wsgi WSGIScriptAliasMatch ^/create$ /usr/share/abrt-retrace/create.wsgi WSGIScriptAliasMatch ^/[0-9]+/?$ /usr/share/abrt-retrace/status.wsgi WSGIScriptAliasMatch ^/[0-9]+/log$ /usr/share/abrt-retrace/log.wsgi diff --git a/src/retrace/settings.wsgi b/src/retrace/settings.wsgi new file mode 100644 index 00000000..9b5c7e7d --- /dev/null +++ b/src/retrace/settings.wsgi @@ -0,0 +1,21 @@ +#!/usr/bin/python + +import sys +sys.path = ["/usr/share/abrt-retrace"] + sys.path + +from retrace import * + +def application(environ, start_response): + formats = "" + for format in HANDLE_ARCHIVE.keys(): + formats += " %s" % format + + output = [ + "running_tasks %d" % len(get_active_tasks()), + "max_running_tasks %d" % CONFIG["MaxParallelTasks"], + "max_packed_size %d" % CONFIG["MaxPackedSize"], + "max_unpacked_size %d" % CONFIG["MaxUnpackedSize"], + "supported_formats%s" % formats, + ] + + return response(start_response, "200 OK", "\n".join(output)) |