Browse Source

Better handling of exceptions

chirpmodem-v8.0.0
f4exb 10 months ago
parent
commit
32501bba19
  1. 37
      app/main.cpp
  2. 37
      appsrv/main.cpp

37
app/main.cpp

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <QFontDatabase>
#include <QSysInfo>
#include <QSettings>
#include <exception>
#ifdef __APPLE__
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include <QGLFormat>
@ -46,6 +47,40 @@ @@ -46,6 +47,40 @@
#include "dsp/dsptypes.h"
#include "crashhandler.h"
class SDRangelApplication final : public QApplication
{
public:
SDRangelApplication(int &argc, char **argv) : QApplication(argc, argv)
{
}
bool notify(QObject *receiver, QEvent *event) override
{
static bool s_exitRequested = false;
try {
return QApplication::notify(receiver, event);
} catch (const std::bad_alloc &ex) {
qCritical() << "Out of memory in event handler:" << ex.what();
if (receiver && receiver->metaObject()) {
qCritical() << "Failed on object:" << receiver << receiver->metaObject()->className();
} else {
qCritical() << "Failed on object: (null)";
}
} catch (const std::exception &ex) {
qCritical("Unhandled exception in event handler: %s", ex.what());
} catch (...) {
qCritical("Unhandled non-standard exception in event handler.");
}
if (!s_exitRequested) {
s_exitRequested = true;
QCoreApplication::exit(EXIT_FAILURE);
}
return false;
}
};
static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger)
{
QCoreApplication::setOrganizationName(COMPANY);
@ -81,7 +116,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo @@ -81,7 +116,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
qputenv("QT_SCALE_FACTOR", scaleFactor.toLatin1());
}
QApplication a(argc, argv);
SDRangelApplication a(argc, argv);
#if 1
qApp->setStyle(QStyleFactory::create("fusion"));

37
appsrv/main.cpp

@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <QCoreApplication>
#include <QSysInfo>
#include <exception>
#include <signal.h>
#include <vector>
@ -32,6 +33,40 @@ @@ -32,6 +33,40 @@
#include "remotetcpsinkstarter.h"
#include "dsp/dsptypes.h"
class SDRangelServerApplication final : public QCoreApplication
{
public:
SDRangelServerApplication(int &argc, char **argv) : QCoreApplication(argc, argv)
{
}
bool notify(QObject *receiver, QEvent *event) override
{
static bool s_exitRequested = false;
try {
return QCoreApplication::notify(receiver, event);
} catch (const std::bad_alloc &ex) {
qCritical() << "Out of memory in event handler:" << ex.what();
if (receiver && receiver->metaObject()) {
qCritical() << "Failed on object:" << receiver << receiver->metaObject()->className();
} else {
qCritical() << "Failed on object: (null)";
}
} catch (const std::exception &ex) {
qCritical("Unhandled exception in event handler: %s", ex.what());
} catch (...) {
qCritical("Unhandled non-standard exception in event handler.");
}
if (!s_exitRequested) {
s_exitRequested = true;
QCoreApplication::exit(EXIT_FAILURE);
}
return false;
}
};
void handler(int sig) {
fprintf(stderr, "quit the application by signal(%d).\n", sig);
QCoreApplication::quit();
@ -59,7 +94,7 @@ void catchUnixSignals(const std::vector<int>& quitSignals) { @@ -59,7 +94,7 @@ void catchUnixSignals(const std::vector<int>& quitSignals) {
static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger)
{
QCoreApplication a(argc, argv);
SDRangelServerApplication a(argc, argv);
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv");

Loading…
Cancel
Save