Skip to content

Commit

Permalink
common: Remove left-overs from signal handling rework
Browse files Browse the repository at this point in the history
Remove some remnants of the old code that were missed when pushing
the reworked implementation.
  • Loading branch information
Sput42 committed Oct 14, 2018
1 parent 8a8d7e0 commit 4e88f2c
Showing 1 changed file with 4 additions and 35 deletions.
39 changes: 4 additions & 35 deletions src/common/quassel.cpp
Expand Up @@ -65,46 +65,14 @@ bool Quassel::init()
if (instance()->_initialized)
return true; // allow multiple invocations because of MonolithicApplication

#if 0
// Setup signal handling
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
#ifndef Q_OS_WIN
// SIGHUP is used to reload configuration (i.e. SSL certificates)
// Windows does not support SIGHUP
signal(SIGHUP, handleSignal);
#endif

if (instance()->_handleCrashes) {
// we have crashhandler for win32 and unix (based on execinfo).
#if defined(Q_OS_WIN) || defined(HAVE_EXECINFO)
# ifndef Q_OS_WIN
// we only handle crashes ourselves if coredumps are disabled
struct rlimit *limit = (rlimit *)malloc(sizeof(struct rlimit));
int rc = getrlimit(RLIMIT_CORE, limit);

if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
# endif /* Q_OS_WIN */
signal(SIGABRT, handleSignal);
signal(SIGSEGV, handleSignal);
# ifndef Q_OS_WIN
signal(SIGBUS, handleSignal);
}
free(limit);
# endif /* Q_OS_WIN */
#endif /* Q_OS_WIN || HAVE_EXECINFO */
}
#endif

instance()->setupSignalHandling();

instance()->_initialized = true;
qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));

instance()->setupSignalHandling();
instance()->setupEnvironment();
instance()->registerMetaTypes();

instance()->_initialized = true;

Network::setDefaultCodecForServer("UTF-8");
Network::setDefaultCodecForEncoding("UTF-8");
Network::setDefaultCodecForDecoding("ISO-8859-15");
Expand Down Expand Up @@ -334,6 +302,7 @@ void Quassel::setupSignalHandling()
connect(_signalWatcher, SIGNAL(handleSignal(AbstractSignalWatcher::Action)), this, SLOT(handleSignal(AbstractSignalWatcher::Action)));
}


void Quassel::handleSignal(AbstractSignalWatcher::Action action)
{
switch (action) {
Expand Down

0 comments on commit 4e88f2c

Please sign in to comment.