From b8b51b2ba5509513725dcb9abf8289dbcee2999d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 13 Nov 2013 19:04:18 +0100 Subject: [PATCH] added system info & config to the log --- YACReaderLibrary/library_window.cpp | 4 +- YACReaderLibrary/main.cpp | 105 +++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index dbcfd680..db664277 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -59,7 +59,8 @@ #include "comic_vine_dialog.h" //#include "yacreader_social_dialog.h" -// + +#include "QsLog.h" LibraryWindow::LibraryWindow() :QMainWindow(),fullscreen(false),fetching(false),previousFilter("") @@ -1088,6 +1089,7 @@ void LibraryWindow::createLibrary() void LibraryWindow::create(QString source, QString dest, QString name) { + QLOG_INFO() << QString("About to create a library from '%1' to '%2' with name '%3'").arg(source).arg(dest).arg(name); libraryCreator->createLibrary(source,dest); libraryCreator->start(); _lastAdded = name; diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index 1b227c4c..4a7d9f78 100644 --- a/YACReaderLibrary/main.cpp +++ b/YACReaderLibrary/main.cpp @@ -5,6 +5,11 @@ #include #include #include +#include +#include +#include +#include + #if QT_VERSION >= 0x050000 #include #else @@ -15,6 +20,7 @@ #include "startup.h" #include "yacreader_local_server.h" #include "comic_db.h" +#include "db_helper.h" #include "QsLog.h" #include "QsLogDest.h" @@ -26,6 +32,100 @@ Startup * s; using namespace QsLogging; +void logSystemAndConfig() +{ + QLOG_INFO() << "---------- System & configuration ----------"; +#if defined(Q_OS_WIN) + switch (QSysInfo::windowsVersion()) + { + case QSysInfo::WV_NT: + QLOG_INFO() << "SO : Windows NT"; + break; + case QSysInfo::WV_2000: + QLOG_INFO() << "SO : Windows 2000"; + break; + case QSysInfo::WV_XP: + QLOG_INFO() << "SO : Windows XP"; + break; + case QSysInfo::WV_2003: + QLOG_INFO() << "SO : Windows 2003"; + break; + case QSysInfo::WV_VISTA: + QLOG_INFO() << "SO : Windows Vista"; + break; + case QSysInfo::WV_WINDOWS7: + QLOG_INFO() << "SO : Windows 7"; + break; + case QSysInfo::WV_WINDOWS8: + QLOG_INFO() << "SO : Windows 8"; + break; + default: + QLOG_INFO() << "Windows (unknown version)"; + break; + } + +#elif defined(Q_OS_MAC) + + QSysInfo::MV_LION + QSysInfo::MV_MOUNTAINLION + QSysInfo::MV_MAVERICKS + + switch (QSysInfo::macVersion()) + { + case QSysInfo::MV_SNOWLEOPARD: + QLOG_INFO() << "SO : MacOSX Snow Leopard"; + break; + case QSysInfo::MV_LION: + QLOG_INFO() << "SO : MacOSX Lion"; + break; + case QSysInfo::MV_MOUNTAINLION: + QLOG_INFO() << "SO : MacOSX Mountain Lion"; + break; + case QSysInfo::MV_MAVERICKS: + QLOG_INFO() << "SO : MacOSX Maverics"; + break; + default: + QLOG_INFO() << "SO : MacOSX (unknown version)"; + break; + } + +#elif defined(Q_OS_LINUX) + QLOG_INFO() << "SO : Linux (unknown version)"; + +#else + QLOG_INFO() << "SO : Unknown"; +#endif + +#ifdef Q_OS_WIN + if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.dll")) +#else + if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.so")) +#endif + QLOG_INFO() << "7z : found"; + else + QLOG_ERROR() << "7z : not found"; + + if(QFileInfo(QApplication::applicationDirPath()+"/utils/qrencode.exe").exists() || QFileInfo("./util/qrencode").exists()) + QLOG_INFO() << "qrencode : found"; + else + QLOG_INFO() << "qrencode : not found"; + + QSettings settings(QCoreApplication::applicationDirPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); + settings.beginGroup("libraryConfig"); + if(settings.value(SERVER_ON).toBool()) + QLOG_INFO() << "server : enabled"; + else + QLOG_INFO() << "server : disabled"; + + if(settings.value(USE_OPEN_GL).toBool()) + QLOG_INFO() << "OpenGL : enabled" << " - " << (settings.value(V_SYNC).toBool()?"VSync on":"VSync off"); + else + QLOG_INFO() << "OpenGL : disabled"; + + QLOG_INFO() << "Libraries: " << DBHelper::getLibraries(); + QLOG_INFO() << "--------------------------------------------"; +} + int main( int argc, char ** argv ) { QApplication app( argc, argv ); @@ -48,7 +148,7 @@ int main( int argc, char ** argv ) logger.setLoggingLevel(QsLogging::TraceLevel); DestinationPtr fileDestination(DestinationFactory::MakeFileDestination( - destLog, EnableLogRotation, MaxSizeBytes(2048), MaxOldLogCount(2))); + destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2))); DestinationPtr debugDestination(DestinationFactory::MakeDebugOutputDestination()); logger.addDestination(debugDestination); logger.addDestination(fileDestination); @@ -78,6 +178,9 @@ int main( int argc, char ** argv ) } #endif QLOG_INFO() << "YACReaderLibrary attempting to start"; + + logSystemAndConfig(); + if(YACReaderLocalServer::isRunning()) //sólo se permite una instancia de YACReaderLibrary { QLOG_WARN() << "another instance of YACReaderLibrary is running";