From 341ac18f1ad6d238d551b114c53f15b9f29f7f1a Mon Sep 17 00:00:00 2001 From: pazos Date: Tue, 8 May 2018 18:13:29 +0200 Subject: log qt/qml to easylogging, add --log-file cmdline option --- main.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 14097164..ab232156 100644 --- a/main.cpp +++ b/main.cpp @@ -54,6 +54,7 @@ #include "Subaddress.h" #include "model/SubaddressModel.h" #include "wallet/api/wallet2_api.h" +#include "Logger.h" #include "MainApp.h" // IOS exclusions @@ -70,12 +71,6 @@ bool isAndroid = false; bool isWindows = false; bool isDesktop = false; -void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) -{ - // Send all message types to logger - Monero::Wallet::debug("qml", msg.toStdString()); -} - int main(int argc, char *argv[]) { // platform dependant settings @@ -117,16 +112,24 @@ int main(int argc, char *argv[]) app.installEventFilter(eventFilter); QCommandLineParser parser; + QCommandLineOption logPathOption(QStringList() << "l" << "log-file", + QCoreApplication::translate("main", "Log to specified file"), + QCoreApplication::translate("main", "file")); + parser.addOption(logPathOption); parser.addHelpOption(); parser.process(app); Monero::Utils::onStartup(); // Log settings - Monero::Wallet::init(argv[0], "monero-wallet-gui"); -// qInstallMessageHandler(messageHandler); + const QString logPath = getLogPath(parser.value(logPathOption)); + Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str()); + qInstallMessageHandler(messageHandler); - qDebug() << "app startd"; + + // loglevel is configured in main.qml. Anything lower than + // qWarning is not shown here. + qWarning().noquote() << "app startd" << "(log: " + logPath + ")"; // screen settings // Mobile is designed on 128dpi @@ -217,6 +220,8 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("qtRuntimeVersion", qVersion()); + engine.rootContext()->setContextProperty("walletLogPath", logPath); + // Exclude daemon manager from IOS #ifndef Q_OS_IOS const QStringList arguments = QCoreApplication::arguments(); -- cgit v1.2.3 From c9daab71bfee9204ae712d5bf05256cf6619a216 Mon Sep 17 00:00:00 2001 From: pazos Date: Tue, 8 May 2018 18:15:26 +0200 Subject: don't use cmdline arguments as daemon arguments --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index ab232156..cd20432a 100644 --- a/main.cpp +++ b/main.cpp @@ -224,7 +224,7 @@ int main(int argc, char *argv[]) // Exclude daemon manager from IOS #ifndef Q_OS_IOS - const QStringList arguments = QCoreApplication::arguments(); + const QStringList arguments = (QStringList) QCoreApplication::arguments().at(0); DaemonManager * daemonManager = DaemonManager::instance(&arguments); engine.rootContext()->setContextProperty("daemonManager", daemonManager); #endif -- cgit v1.2.3 From 7283fe41c229e7f0a9dd9199e6e45a15c526931b Mon Sep 17 00:00:00 2001 From: pazos Date: Tue, 8 May 2018 18:19:55 +0200 Subject: use qWarning/qCritical on QrCodeScanner info/errors --- main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index cd20432a..a2274128 100644 --- a/main.cpp +++ b/main.cpp @@ -294,13 +294,13 @@ int main(int argc, char *argv[]) QObject *qmlCamera = rootObject->findChild("qrCameraQML"); if (qmlCamera) { - qDebug() << "QrCodeScanner : object found"; + qWarning() << "QrCodeScanner : object found"; QCamera *camera_ = qvariant_cast(qmlCamera->property("mediaObject")); QObject *qmlFinder = rootObject->findChild("QrFinder"); qobject_cast(qmlFinder)->setSource(camera_); } else - qDebug() << "QrCodeScanner : something went wrong !"; + qCritical() << "QrCodeScanner : something went wrong !"; #endif QObject::connect(eventFilter, SIGNAL(sequencePressed(QVariant,QVariant)), rootObject, SLOT(sequencePressed(QVariant,QVariant))); -- cgit v1.2.3 From 15155f2db8d20d09c68070f39d583fa263b7fe15 Mon Sep 17 00:00:00 2001 From: pazos Date: Tue, 8 May 2018 18:22:21 +0200 Subject: print logs on console --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index a2274128..e7dba2a9 100644 --- a/main.cpp +++ b/main.cpp @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) // Log settings const QString logPath = getLogPath(parser.value(logPathOption)); - Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str()); + Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str(), true); qInstallMessageHandler(messageHandler); -- cgit v1.2.3