/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
#include "corebufferviewmanager.h"
+#include "coredccconfig.h"
#include "coreeventmanager.h"
#include "coreidentity.h"
#include "coreignorelistmanager.h"
_bufferSyncer(new CoreBufferSyncer(this)),
_backlogManager(new CoreBacklogManager(this)),
_bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
+ _dccConfig(new CoreDccConfig(this)),
_ircListHelper(new CoreIrcListHelper(this)),
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
p->synchronize(_backlogManager);
+ p->synchronize(dccConfig());
p->synchronize(ircListHelper());
p->synchronize(networkConfig());
p->synchronize(&_coreInfo);
CoreSession::~CoreSession()
{
saveSessionState();
+
+ /* Why partially duplicate CoreNetwork destructor? When each CoreNetwork quits in the
+ * destructor, disconnections are processed in sequence for each object. For many IRC servers
+ * on a slow network, this could significantly delay core shutdown [msecs wait * network count].
+ *
+ * Here, CoreSession first calls disconnect on all networks, letting them all start
+ * disconnecting before beginning to sequentially wait for each network. Ideally, after the
+ * first network is disconnected, the other networks will have already closed. Worst-case may
+ * still wait [msecs wait time * num. of networks], but the risk should be much lower.
+ *
+ * CoreNetwork should still do cleanup in its own destructor in case a network is deleted
+ * outside of deleting the whole CoreSession.
+ *
+ * If this proves to be problematic in the future, there's an alternative Qt signal-based system
+ * implemented in another pull request that guarentees a maximum amount of time to disconnect,
+ * but at the cost of more complex code.
+ *
+ * See https://github.com/quassel/quassel/pull/203
+ */
+
+ foreach(CoreNetwork *net, _networks.values()) {
+ // Request each network properly disconnect, but don't count as user-requested disconnect
+ if (net->socketConnected()) {
+ // Only try if the socket's fully connected (not initializing or disconnecting).
+ // Force an immediate disconnect, jumping the command queue. Ensures the proper QUIT is
+ // shown even if other messages are queued.
+ net->disconnectFromIrc(false, QString(), false, true);
+ }
+ }
+
+ // Process the putCmd events that trigger the quit. Without this, shutting down the core
+ // results in abrubtly closing the socket rather than sending the QUIT as expected.
+ QCoreApplication::processEvents();
+
foreach(CoreNetwork *net, _networks.values()) {
+ // Wait briefly for each network to disconnect. Sometimes it takes a little while to send.
+ if (!net->forceDisconnect()) {
+ qWarning() << "Timed out quitting network" << net->networkName() <<
+ "(user ID " << net->userId() << ")";
+ }
+ // Delete the network now that it's closed
delete net;
}
}
if (identity->detachAwayEnabled() && !me->isAway()) {
if (!identity->detachAwayReason().isEmpty())
- awayReason = identity->detachAwayReason();
+ awayReason = formatCurrentDateTimeInString(identity->detachAwayReason());
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}