#endif
#include "quassel.h"
+#include "types.h"
int main(int argc, char **argv)
{
umask(S_IRWXG | S_IRWXO);
#endif
+ // Instantiate early, so log messages are handled
+ Quassel::instance();
+
#if QT_VERSION < 0x050000
// All our source files are in UTF-8, and Qt5 even requires that
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
cliParser->addSwitch("oidentd", 0, "Enable oidentd integration. In most cases you should also enable --strict-ident");
cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
cliParser->addSwitch("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting.");
+ cliParser->addSwitch("ident-daemon", 0, "Enable internal ident daemon");
+ cliParser->addOption("ident-port", 0, "The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon", "port", "10113");
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
AboutData::setQuasselPersons(&aboutData);
KAboutData::setApplicationData(aboutData.kAboutData());
#endif
- if (!app.init())
- return EXIT_FAILURE;
+ try {
+ app.init();
+ }
+ catch (ExitException e) {
+ if (!e.errorString.isEmpty()) {
+ qCritical() << e.errorString;
+ }
+ return e.exitCode;
+ }
return app.exec();
}