diff options
| -rw-r--r-- | abrt.init | 22 | ||||
| -rw-r--r-- | abrt.spec | 10 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | doc/CodingStyle | 6 | ||||
| -rw-r--r-- | doc/PLUGINS-HOWTO | 4 | ||||
| -rw-r--r-- | lib/CommLayer/DBusClientProxy.h | 72 | ||||
| -rw-r--r-- | lib/CommLayer/DBusServerProxy.h | 11 | ||||
| -rw-r--r-- | lib/CommLayer/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Plugins/FileTransfer.conf | 2 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 18 | ||||
| -rw-r--r-- | lib/Plugins/abrt-Bugzilla.7 | 12 | ||||
| -rw-r--r-- | lib/Plugins/abrt-FileTransfer.7 | 16 | ||||
| -rw-r--r-- | lib/Plugins/abrt-KerneloopsReporter.7 | 6 | ||||
| -rw-r--r-- | lib/Plugins/abrt-KerneloopsScanner.7 | 8 | ||||
| -rw-r--r-- | lib/Plugins/abrt-Logger.7 | 6 | ||||
| -rw-r--r-- | lib/Plugins/abrt-Mailx.7 | 6 | ||||
| -rw-r--r-- | lib/Plugins/abrt-RunApp.7 | 6 | ||||
| -rw-r--r-- | lib/Plugins/abrt-SQLite3.7 | 4 | ||||
| -rw-r--r-- | lib/Plugins/abrt-plugins.7 | 4 | ||||
| -rw-r--r-- | src/Applet/Applet.cpp | 34 | ||||
| -rw-r--r-- | src/CLI/CLI.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.h | 4 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 31 | ||||
| -rw-r--r-- | src/Daemon/abrt.8 | 2 | ||||
| -rw-r--r-- | src/Daemon/abrt.conf.5 | 8 | ||||
| -rw-r--r-- | src/Daemon/exported-symbols | 4 | ||||
| -rw-r--r-- | src/Hooks/abrt_exception_handler.py.in | 2 |
27 files changed, 162 insertions, 152 deletions
@@ -25,7 +25,7 @@ RETVAL=0 check() { # Check that we're a privileged user [ `id -u` = 0 ] || exit 4 - + # Check if abrt is executable test -x /usr/sbin/abrt || exit 5 } @@ -33,14 +33,14 @@ check() { start() { check - + # Check if it is already running if [ ! -f /var/lock/subsys/abrt ]; then - echo -n $"Starting abrt daemon: " - daemon /usr/sbin/abrt - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt - echo + echo -n $"Starting abrt daemon: " + daemon /usr/sbin/abrt + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt + echo fi return $RETVAL } @@ -48,24 +48,24 @@ start() { stop() { check - + echo -n $"Stopping abrt daemon: " killproc /usr/sbin/abrt RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt echo - return $RETVAL + return $RETVAL } restart() { stop start -} +} reload() { restart -} +} case "$1" in start) @@ -24,8 +24,8 @@ BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -%{name} is a tool to help users to detect defects in applications and -to create a bug report with all informations needed by maintainer to fix it. +%{name} is a tool to help users to detect defects in applications and +to create a bug report with all informations needed by maintainer to fix it. It uses plugin system to extend its functionality. %package libs @@ -59,7 +59,7 @@ Requires: gdb Requires: %{name} = %{version}-%{release} %description addon-ccpp -This package contains hook for C/C++ crashed programs and %{name}'s C/C++ +This package contains hook for C/C++ crashed programs and %{name}'s C/C++ analyzer plugin. %package addon-kerneloops @@ -89,7 +89,7 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description plugin-sqlite3 -This package contains SQLite3 database plugin. It is used for storing the data +This package contains SQLite3 database plugin. It is used for storing the data required for creating a bug report. %package plugin-logger @@ -108,7 +108,7 @@ Requires: mailx %description plugin-mailx The simple reporter plugin, which sends a report via mailx to a specified -email. +email. %package plugin-runapp Summary: %{name}'s runapp plugin diff --git a/configure.ac b/configure.ac index 33e3cd3a..8f378116 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ if test -z "$PYTHON"; then echo "*** Essential program python not found" 1>&2 exit 1 fi - + PKG_CHECK_MODULES([SQLITE3], [sqlite3]) PKG_CHECK_MODULES([GTK], [gtk+-2.0]) PKG_CHECK_MODULES([GLIB], [glib-2.0]) @@ -37,22 +37,22 @@ PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' DEBUG_DUMPS_DIR='${localstatedir}/cache/${PACKAGE_NAME}' -AC_ARG_WITH(debugdumpsdir, +AC_ARG_WITH(debugdumpsdir, [AS_HELP_STRING([--with-debugdumpdir=DIR], [Directory where debugdumps are created])], [DEBUG_DUMPS_DIR="$withval"]) AC_ARG_ENABLE(socket, - [AC_HELP_STRING([--enable-socket], + [AC_HELP_STRING([--enable-socket], [Enable socket communication. Disable DBus communication])], [ENABLE_SOCKET_OR_DBUS='-DENABLE_SOCKET=1']) AC_ARG_ENABLE(dbus, - [AC_HELP_STRING([--enable-dbus], + [AC_HELP_STRING([--enable-dbus], [Enable DBus communication. Disable socket communication @<:@default@:>@])], [ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1']) - -AC_SUBST(ENABLE_SOCKET_OR_DBUS) + +AC_SUBST(ENABLE_SOCKET_OR_DBUS) AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) diff --git a/doc/CodingStyle b/doc/CodingStyle index 2cc2cf6e..3a254b7f 100644 --- a/doc/CodingStyle +++ b/doc/CodingStyle @@ -8,7 +8,7 @@ Coding style used in abrt 1.2 Method ----------- 1.2.1 method starts witch a capital letter -1.2.2 method name can contain only letters +1.2.2 method name can contain only letters 1.2.3 parameter of a method has to start with the letter 'p' 1.3 Attribute @@ -46,8 +46,8 @@ class CAwesomeClass COtherClass* m_pOtherClass; void PrivateFunction(int pParameter); public: - CAwesomeClass(std::string pName) : - m_sName(pName), m_pOtherClass(NULL) + CAwesomeClass(std::string pName) : + m_sName(pName), m_pOtherClass(NULL) {} }; diff --git a/doc/PLUGINS-HOWTO b/doc/PLUGINS-HOWTO index 2ca6b8e6..ef0c6ba6 100644 --- a/doc/PLUGINS-HOWTO +++ b/doc/PLUGINS-HOWTO @@ -32,7 +32,7 @@ virtual void Run(const std::string& pActiveDir, The first argument is a directory name. It can be either the current debug dump dir or a directory that contains all debug dumps. The second argument is a string with arguments specified for the action. - + Analyzer Plugin --------------- This plugin has to compute the UUID of the crash. Crashes differ, depending on @@ -106,7 +106,7 @@ virtual const vector_database_rows_t GetUIDData(const std::string& pUID) = 0; virtual const database_row_t GetUUIDData(const std::string& pUUID, const std::string& pUID) = 0; -- get a database row for the specified user ID and UUID +- get a database row for the specified user ID and UUID The macro PLUGIN_INFO diff --git a/lib/CommLayer/DBusClientProxy.h b/lib/CommLayer/DBusClientProxy.h index 52ba75d5..0293b0a9 100644 --- a/lib/CommLayer/DBusClientProxy.h +++ b/lib/CommLayer/DBusClientProxy.h @@ -1,22 +1,22 @@ -/* - Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) - Copyright (C) 2009 RedHat inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +/* + Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) + Copyright (C) 2009 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + #include <dbus-c++/dbus.h> #include <dbus-c++/glib-integration.h> #include "DBusCommon.h" @@ -62,7 +62,8 @@ private: ri >> name; ri >> old_owner; ri >> new_owner; - if(name.compare("com.redhat.abrt") == 0){ + if(name.compare("com.redhat.abrt") == 0) + { if(new_owner.length() > 0) { if(m_pStateChangeHandler) @@ -107,7 +108,7 @@ public: std::cout << "~DaemonWatcher" << std::endl; } }; - + class CDBusClient_proxy : public DBus::InterfaceProxy @@ -119,7 +120,7 @@ private: std::string m_sConnName; public: - + CDBusClient_proxy() : DBus::InterfaceProxy(CC_DBUS_IFACE) { @@ -127,7 +128,7 @@ public: connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub); m_sConnName = ""; } - + CDBusClient_proxy(::DBus::Connection &pConnection) : DBus::InterfaceProxy(CC_DBUS_IFACE) { @@ -144,8 +145,8 @@ public: * this functions will invoke the corresponding methods on the remote objects */ /* - - < + + < <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage> <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage> <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage> @@ -155,7 +156,6 @@ public: vector_crash_infos_t GetCrashInfos() { DBus::CallMessage call; - DBus::MessageIter wi = call.writer(); call.member("GetCrashInfos"); @@ -166,11 +166,11 @@ public: ri >> argout; return argout; } - + bool DeleteDebugDump(const std::string& pUUID) { DBus::CallMessage call; - + DBus::MessageIter wi = call.writer(); wi << pUUID; @@ -182,12 +182,12 @@ public: ri >> argout; return argout; } - + map_crash_report_t CreateReport(const std::string& pUUID) { m_bJobDone = false; DBus::CallMessage call; - + DBus::MessageIter wi = call.writer(); wi << pUUID; @@ -199,11 +199,11 @@ public: g_main_loop_run(gloop); return GetJobResult(m_iPendingJobID); }; - + void Report(map_crash_report_t pReport) { DBus::CallMessage call; - + DBus::MessageIter wi = call.writer(); wi << pReport; @@ -211,11 +211,11 @@ public: DBus::Message ret = invoke_method(call); DBus::MessageIter ri = ret.reader(); } - + map_crash_report_t GetJobResult(uint64_t pJobID) { DBus::CallMessage call; - + DBus::MessageIter wi = call.writer(); wi << pJobID; @@ -226,13 +226,13 @@ public: ri >> argout; return argout; } - + public: /* signal handlers for this interface */ virtual void Crash(std::string& value){} - + private: /* unmarshalers (to unpack the DBus message before calling the actual signal handler) @@ -244,7 +244,7 @@ private: std::string value; ri >> value; Crash(value); } - + void _JobDone_stub(const ::DBus::SignalMessage &sig) { DBus::MessageIter ri = sig.reader(); diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h index 1b8159b6..dbf48ad1 100644 --- a/lib/CommLayer/DBusServerProxy.h +++ b/lib/CommLayer/DBusServerProxy.h @@ -95,7 +95,7 @@ public: virtual bool Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0; virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0; virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0; - + public: /* signal emitters for this interface @@ -116,8 +116,7 @@ public: wi << arg1; emit_signal(sig); } - - + void JobDone(const std::string &pDest, uint64_t job_id) { ::DBus::SignalMessage sig("JobDone"); @@ -134,7 +133,7 @@ public: wi << arg1; emit_signal(sig); } - + void Update(const std::string pDest, const std::string& pMessage) { ::DBus::SignalMessage sig("Update"); @@ -143,7 +142,7 @@ public: wi << pMessage; emit_signal(sig); } - + void Warning(const std::string& arg1) { ::DBus::SignalMessage sig("Warning"); @@ -204,7 +203,7 @@ private: wi << argout1; return reply; } - + DBus::Message _GetJobResult_stub(const DBus::CallMessage &call) { DBus::MessageIter ri = call.reader(); diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am index 5a1fa503..0b52369f 100644 --- a/lib/CommLayer/Makefile.am +++ b/lib/CommLayer/Makefile.am @@ -5,7 +5,7 @@ libABRTCommLayer_la_SOURCES = CommLayerServer.h CommLayerServer.cpp \ DBusServerProxy.h Observer.h DBusCommon.h \ CommLayerInner.h CommLayerInner.cpp \ DBusClientProxy.h CommLayerClientDBus.h CommLayerClientDBus.cpp - + libABRTCommLayer_la_LIBADD = ../../lib/MiddleWare/libABRTMiddleWare.la $(DL_LIBS) $(DBUSCPP_LIBS) libABRTCommLayer_la_LDFLAGS = -version-info 0:1:0 libABRTCommLayer_la_CPPFLAGS = -Wall -Werror -I$(srcdir)/../../lib/MiddleWare\ diff --git a/lib/Plugins/FileTransfer.conf b/lib/Plugins/FileTransfer.conf index cf675e45..75e5671e 100644 --- a/lib/Plugins/FileTransfer.conf +++ b/lib/Plugins/FileTransfer.conf @@ -1,6 +1,6 @@ # Configuration of the file transfer reporter plugin # it takes one parameter: -# store - just save information about crash +# store - just save information about crash # upload - upload new crash or saved crashes to the specified url # URL to upload the files to diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index 7c1ddbb1..a0616888 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -31,40 +31,40 @@ install-data-hook: $(DESTDIR)$(sysconfdir)/abrt/plugins/Logger.conf # CCpp -libCCpp_la_SOURCES = CCpp.cpp CCpp.h +libCCpp_la_SOURCES = CCpp.cpp CCpp.h libCCpp_la_LDFLAGS = -avoid-version libCCpp_la_LIBADD = $(NSS_LIBS) libCCpp_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(NSS_CFLAGS) # Kerneloops -libKerneloops_la_SOURCES = Kerneloops.cpp Kerneloops.h +libKerneloops_la_SOURCES = Kerneloops.cpp Kerneloops.h libKerneloops_la_LDFLAGS = -avoid-version libKerneloops_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils # KerneloopsReporter -libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h +libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h libKerneloopsReporter_la_LDFLAGS = -avoid-version libKerneloopsReporter_la_LIBADD = $(CURL_LIBS) libKerneloopsReporter_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # KerneloopsScanner -libKerneloopsScanner_la_SOURCES = KerneloopsScanner.cpp KerneloopsScanner.h KerneloopsSysLog.cpp KerneloopsSysLog.h +libKerneloopsScanner_la_SOURCES = KerneloopsScanner.cpp KerneloopsScanner.h KerneloopsSysLog.cpp KerneloopsSysLog.h libKerneloopsScanner_la_LDFLAGS = -avoid-version libKerneloopsScanner_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" # Mailx -libMailx_la_SOURCES = Mailx.cpp Mailx.h +libMailx_la_SOURCES = Mailx.cpp Mailx.h libMailx_la_LDFLAGS = -avoid-version libMailx_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # SQLite3 -libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h +libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h libSQLite3_la_LDFLAGS = -avoid-version libSQLite3_la_LIBADD = $(SQLITE3_LIBS) libSQLite3_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(SQLITE3_CFLAGS) -DLOCALSTATEDIR='"$(localstatedir)"' # Logger -libLogger_la_SOURCES = Logger.cpp Logger.h +libLogger_la_SOURCES = Logger.cpp Logger.h libLogger_la_LDFLAGS = -avoid-version libLogger_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" @@ -77,7 +77,7 @@ libSOSreport_la_SOURCES = SOSreport.cpp SOSreport.h libSOSreport_la_LDFLAGS = -avoid-version # Bugzilla -libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp +libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp libBugzilla_la_LIBADD = $(XMLRPC_CPP_LIBS) $(XMLRPC_CLIENT_CPP_LIBS) $(NSS_LIBS) libBugzilla_la_LDFLAGS = -avoid-version libBugzilla_la_CPPFLAGS = $(XMLRPC_CPP_CFLAGS) $(XMLRPC_CLIENT_CPP_CFLAGS) $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" @@ -89,7 +89,7 @@ libPython_la_LDFLAGS = -avoid-version libPython_la_CPPFLAGS = $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils # FileTrasfer -libFileTransfer_la_SOURCES = FileTransfer.cpp FileTransfer.h +libFileTransfer_la_SOURCES = FileTransfer.cpp FileTransfer.h libFileTransfer_la_LDFLAGS = -avoid-version libFileTransfer_la_LIBADD = $(CURL_LIBS) libFileTransfer_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(CURL_CFLAGS) -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" diff --git a/lib/Plugins/abrt-Bugzilla.7 b/lib/Plugins/abrt-Bugzilla.7 index c3c0e902..99bb60d1 100644 --- a/lib/Plugins/abrt-Bugzilla.7 +++ b/lib/Plugins/abrt-Bugzilla.7 @@ -5,15 +5,15 @@ Bugzilla plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIBugzilla\fP plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIBugzilla\fP plugin for \fIabrt\fP. .P -This plugin is used to report the crash to a Bugzilla instance. The -plugin will determine the package name and distribution version. The +This plugin is used to report the crash to a Bugzilla instance. The +plugin will determine the package name and distribution version. The crash data is attached to the bug report. .SH INVOCATION -The plugin is invoked in the \fIabrt.conf\fP configuration file. +The plugin is invoked in the \fIabrt.conf\fP configuration file. No parameters are necessary. .SH CONFIGURATION The \fIBugzilla.conf\fP configuration file contains several @@ -39,5 +39,5 @@ ActionsAndReporters = Bugzilla .IR abrt.conf (5), .IR abrt-plugins (7) .SH AUTHOR -Written by Zdenek Prikryl <zprikryl@redhat.com>. +Written by Zdenek Prikryl <zprikryl@redhat.com>. Manual page written by Daniel Novotny <dnovotny@redhat.com>. diff --git a/lib/Plugins/abrt-FileTransfer.7 b/lib/Plugins/abrt-FileTransfer.7 index b126c2c9..a04dd421 100644 --- a/lib/Plugins/abrt-FileTransfer.7 +++ b/lib/Plugins/abrt-FileTransfer.7 @@ -5,18 +5,18 @@ FileTransfer plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIFileTransfer\fP plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIFileTransfer\fP plugin for \fIabrt\fP. .P This plugin is used to transfer the crash report to another machine using a file transfer protocol. The protocols supported -are FTP, FTPS, HTTP, HTTPS, SCP, SFTP, and TFTP. +are FTP, FTPS, HTTP, HTTPS, SCP, SFTP, and TFTP. .SH INVOCATION .P The plugin is invoked in the \fIabrt.conf\fP file, usually in the \fIActionsAndReporters\fP option and/or the \fI[cron]\fP section. -There are two modes of invocation: +There are two modes of invocation: .P * If you use the parameter \fI"store"\fP, the plugin stores a record of the occurrence of @@ -27,12 +27,12 @@ plugin will iterate through the internal list and will send every recorded crash to the server specified in the \fIFileTransfer.conf\fP configuration file. After that, the internal list is cleared. .P -On a production machine, you probably do not want the daemon to send crash +On a production machine, you probably do not want the daemon to send crash data at times that the machine is busy working. This second mode allows you -to send crash reports at a quieter time (at night, perhaps) that you +to send crash reports at a quieter time (at night, perhaps) that you schedule in the \fI[cron]\fP section of \fIabrt.conf\fP. .SH CONFIGURATION -The \fIFileTransfer.conf\fP configuration file contains +The \fIFileTransfer.conf\fP configuration file contains several entries in the format "Option = Value". The options are: .SS URL The URL of the server, where the crash should @@ -41,7 +41,7 @@ the user name and the password, for example: .br URL = ftp://user:passwd@server.com/path .SS ArchiveType -The type of the archive in which to pack the crash data. +The type of the archive in which to pack the crash data. Currently, \fI.tar.gz\fP, \fI.tar.bz2\fP and \fI.zip\fP are supported. The plugin currently relies on external file archiving commandline utilities, which will create the archive. diff --git a/lib/Plugins/abrt-KerneloopsReporter.7 b/lib/Plugins/abrt-KerneloopsReporter.7 index e0d32c35..98bd3874 100644 --- a/lib/Plugins/abrt-KerneloopsReporter.7 +++ b/lib/Plugins/abrt-KerneloopsReporter.7 @@ -5,13 +5,13 @@ KerneloopsReporter plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIKerneloopsReporter\fP +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIKerneloopsReporter\fP plugin for \fIabrt\fP. .P This plugin is used to report the crash to the Kerneloops tracker. .SH INVOCATION -The plugin is invoked in the \fIabrt.conf\fP configuration file. +The plugin is invoked in the \fIabrt.conf\fP configuration file. No parameters are necessary. .SH CONFIGURATION The \fIKerneloopsReporter.conf\fP configuration file contains one entry: diff --git a/lib/Plugins/abrt-KerneloopsScanner.7 b/lib/Plugins/abrt-KerneloopsScanner.7 index d9642a97..ff094847 100644 --- a/lib/Plugins/abrt-KerneloopsScanner.7 +++ b/lib/Plugins/abrt-KerneloopsScanner.7 @@ -5,8 +5,8 @@ KerneloopsScanner plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIKerneloopsScanner\fP +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIKerneloopsScanner\fP plugin for \fIabrt\fP. .P This plugin reads the system log file (default /var/log/messages) @@ -17,12 +17,12 @@ To distinguish between new crashes and crashes that were already reported, the plugin makes its own entry in the log file, which acts as a separator. .SH INVOCATION -The plugin is invoked in the \fIabrt.conf\fP configuration file. +The plugin is invoked in the \fIabrt.conf\fP configuration file. No parameters are necessary. .SH CONFIGURATION The \fIKerneloopsScanner.conf\fP configuration file contains one entry: .SS SysLogFile -The file to scan. The default is +The file to scan. The default is .br SysLogFile = /var/log/messages .SH EXAMPLES diff --git a/lib/Plugins/abrt-Logger.7 b/lib/Plugins/abrt-Logger.7 index 0f814d24..8ae679f8 100644 --- a/lib/Plugins/abrt-Logger.7 +++ b/lib/Plugins/abrt-Logger.7 @@ -5,8 +5,8 @@ Logger plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fILogger\fP plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fILogger\fP plugin for \fIabrt\fP. .P This plugin is used to log the crash to a file. @@ -16,7 +16,7 @@ content. It also contains "duplicity check": the ID of the crash, which is used to tell whether the same crash has happened previously. .SH INVOCATION -The plugin is invoked in the \fIabrt.conf\fP configuration file. +The plugin is invoked in the \fIabrt.conf\fP configuration file. No parameters are necessary. .SH CONFIGURATION The \fILogger.conf\fP configuration file contains diff --git a/lib/Plugins/abrt-Mailx.7 b/lib/Plugins/abrt-Mailx.7 index 10d5e4b8..90a8bbce 100644 --- a/lib/Plugins/abrt-Mailx.7 +++ b/lib/Plugins/abrt-Mailx.7 @@ -5,8 +5,8 @@ Mailx plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIMailx\fP plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIMailx\fP plugin for \fIabrt\fP. .P This plugin is used to mail the data about the crash @@ -42,7 +42,7 @@ These are snippets from the \fIabrt.conf\fP configuration file. .br ActionsAndReporters = Mailx("[abrt] a crash occurs") .P -2) When a program in a specific package (in this case "httpd") crashes, +2) When a program in a specific package (in this case "httpd") crashes, send a mail about it. .PP [AnalyzerActionsAndReporters] diff --git a/lib/Plugins/abrt-RunApp.7 b/lib/Plugins/abrt-RunApp.7 index 6d75b12c..56a8d2b0 100644 --- a/lib/Plugins/abrt-RunApp.7 +++ b/lib/Plugins/abrt-RunApp.7 @@ -5,13 +5,13 @@ RunApp plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fIRunApp\fP plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fIRunApp\fP plugin for \fIabrt\fP. .P This plugin is used to run a specified application when the crash occurs. .SH INVOCATION -The plugin is invoked in the \fIabrt.conf\fP configuration file. +The plugin is invoked in the \fIabrt.conf\fP configuration file. The first parameter is the command to run. The second, optional parameter specifies an output file, to which the standard output of the program is saved. diff --git a/lib/Plugins/abrt-SQLite3.7 b/lib/Plugins/abrt-SQLite3.7 index 87df539f..c2b39d86 100644 --- a/lib/Plugins/abrt-SQLite3.7 +++ b/lib/Plugins/abrt-SQLite3.7 @@ -5,8 +5,8 @@ SQLite3 database plugin for abrt(8) .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to -its configuration. This manual page describes the \fISQLite3\fP database plugin +it collects the crash data and takes action according to +its configuration. This manual page describes the \fISQLite3\fP database plugin for \fIabrt\fP. .P This is a database plugin: \fIabrt\fP needs a database in which to store diff --git a/lib/Plugins/abrt-plugins.7 b/lib/Plugins/abrt-plugins.7 index a7c185cc..3a99dcbb 100644 --- a/lib/Plugins/abrt-plugins.7 +++ b/lib/Plugins/abrt-plugins.7 @@ -9,10 +9,10 @@ it collects the crash data (core file, application's command line etc.) and takes action according to the type of application that crashed and according to the configuration specified in the .I abrt.conf -configuration file. +configuration file. .P Plugins allow abrt to perform various actions: for example, -to report the crash to Bugzilla, to mail the report, to transfer +to report the crash to Bugzilla, to mail the report, to transfer the report via FTP or SCP, or to run a program that you specify. .P This manual page provides a list of all the manual pages for diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp index adcfb47d..53f00436 100644 --- a/src/Applet/Applet.cpp +++ b/src/Applet/Applet.cpp @@ -1,20 +1,20 @@ -/* - Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) - Copyright (C) 2009 RedHat inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +/* + Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) + Copyright (C) 2009 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "CCApplet.h" diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index 251407b4..aaaef5bc 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -136,7 +136,7 @@ int main(int argc, char** argv) dispatcher.attach(NULL); DBus::default_dispatcher = &dispatcher; DBus::Connection conn = DBus::Connection::SystemBus(); - CCommLayerClientDBus ABRTDaemon(conn, CC_DBUS_PATH, CC_DBUS_NAME); + CCommLayerClientDBus ABRTDaemon(conn, CC_DBUS_PATH, CC_DBUS_NAME); if(!conn.has_name(CC_DBUS_NAME)){ std::cout << "Daemon is not running!" << std::endl; return -1; diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index 66ca71f0..bc71269d 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -69,7 +69,7 @@ class CCrashWatcher {} } cron_callback_data_t; - + typedef struct SThreadData{ pthread_t thread_id; char* UUID; @@ -77,7 +77,7 @@ class CCrashWatcher char *dest; CCrashWatcher *daemon; } thread_data_t; - + /** * Map to cache the results from CreateReport_t * <UID, <UUID, result>> diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index b6a66f69..18fffc63 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,15 +1,26 @@ sbin_PROGRAMS = abrt -abrt_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp \ - DBusCommon.h Settings.h Settings.cpp -abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\ - -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils \ - -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ - -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ - -DCONF_DIR=\"$(CONF_DIR)\" \ - -DVAR_RUN=\"$(VAR_RUN)\" $(ENABLE_SOCKET_OR_DBUS) +abrt_SOURCES = \ + CrashWatcher.cpp CrashWatcher.h \ + Daemon.cpp \ + DBusCommon.h \ + Settings.h Settings.cpp +abrt_CPPFLAGS = \ + -I$(srcdir)/../../inc \ + -I$(srcdir)/../../lib/MiddleWare \ + -I$(srcdir)/../../lib/CommLayer \ + -I$(srcdir)/../../lib/Utils \ + -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ + -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DCONF_DIR=\"$(CONF_DIR)\" \ + -DVAR_RUN=\"$(VAR_RUN)\" \ + $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ + $(ENABLE_SOCKET_OR_DBUS) +abrt_LDADD = \ + ../../lib/MiddleWare/libABRTMiddleWare.la \ + ../../lib/CommLayer/libABRTCommLayer.la \ + $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) -abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ dist_dbusabrtconf_DATA = dbus-abrt.conf diff --git a/src/Daemon/abrt.8 b/src/Daemon/abrt.8 index f3ae1279..b106041d 100644 --- a/src/Daemon/abrt.8 +++ b/src/Daemon/abrt.8 @@ -27,7 +27,7 @@ to print more debugging information when the daemon is started. When you use some other crash-catching tool, specific for an application or an application type (for example BugBuddy for GNOME applications), crashes of this type will be handled by that tool and -not by \fIabrt\fP. If you want \fIabrt\fP to handle these crashes, +not by \fIabrt\fP. If you want \fIabrt\fP to handle these crashes, turn off the higher-level crash-catching tool. .SH "SEE ALSO" .IR abrt.conf (5), diff --git a/src/Daemon/abrt.conf.5 b/src/Daemon/abrt.conf.5 index edccb596..3b172bcb 100644 --- a/src/Daemon/abrt.conf.5 +++ b/src/Daemon/abrt.conf.5 @@ -5,11 +5,11 @@ abrt.conf \- configuration file for abrt .P .I abrt is a daemon that watches for application crashes. When a crash occurs, -it collects the crash data and takes action according to +it collects the crash data and takes action according to its configuration. This manual page describes \fIabrt\fP's configuration file. .P -The configuration file consists of sections, each section contains +The configuration file consists of sections, each section contains several items in the format "Option = Value". A description of each section follows: .SS [Common] @@ -21,7 +21,7 @@ will report crashes only in GPG signed packages. When set to "no", it will report crashes also in unsigned packages. .TP .B OpenGPGPublicKeys = \fIfilename\fP , \fIfilename\fP ... -These are the trusted GPG keys with which packages have to be +These are the trusted GPG keys with which packages have to be signed for .I abrt to report them if "EnableOpenGPG = yes". @@ -35,7 +35,7 @@ will ignore packages in this list and will not handle their crashes. will only load plugins in this list. .TP .B Database = \fIdatabasePlugin\fP -This specifies which database plugin +This specifies which database plugin .I abrt uses to store metadata about the crash. .TP diff --git a/src/Daemon/exported-symbols b/src/Daemon/exported-symbols index 511b5986..28100103 100644 --- a/src/Daemon/exported-symbols +++ b/src/Daemon/exported-symbols @@ -1,3 +1,3 @@ -{ - get_commlayer; +{ + get_commlayer; }; diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in index 4643db60..1532357a 100644 --- a/src/Hooks/abrt_exception_handler.py.in +++ b/src/Hooks/abrt_exception_handler.py.in @@ -200,7 +200,7 @@ def handleMyException((etype, value, tb)): progname - the name of the application version - the version of the application """ - + # restore original exception handler sys.excepthook = sys.__excepthook__ # pylint: disable-msg=E1101 |