mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-21 05:11:44 +02:00
Don't use QTextStream for logging *sigh*
This commit is contained in:
@@ -50,7 +50,7 @@ FuzzyIndex::FuzzyIndex( QObject* parent, const QString& filename, bool wipe )
|
|||||||
}
|
}
|
||||||
catch ( LuceneException& error )
|
catch ( LuceneException& error )
|
||||||
{
|
{
|
||||||
tDebug() << "Caught Lucene error:" << error.what();
|
tDebug() << "Caught Lucene error:" << QString::fromWCharArray(error.getError().c_str());
|
||||||
failed = true;
|
failed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -38,11 +38,40 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
QTextStream logStream;
|
# if defined (_WIN32) && defined (__GLIBCXX__)
|
||||||
|
#include <ext/stdio_filebuf.h>
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
|
std::ostream*
|
||||||
|
open_ofstream( const QString& fileName )
|
||||||
|
{
|
||||||
|
FILE* c_file = _wfopen( fileName.toStdWString().c_str(), L"a+" );
|
||||||
|
|
||||||
|
__gnu_cxx::stdio_filebuf< char >* buffer = new __gnu_cxx::stdio_filebuf< char >( c_file, std::ios_base::out, 1 );
|
||||||
|
|
||||||
|
return new ostream( buffer );
|
||||||
|
}
|
||||||
|
# elif defined( _MSC_VER )
|
||||||
|
std::ostream*
|
||||||
|
open_ofstream( const QString& fileName )
|
||||||
|
{
|
||||||
|
return new ofstream( fileName.toStdWString().c_str() );
|
||||||
|
}
|
||||||
|
# else
|
||||||
|
std::ostream*
|
||||||
|
open_ofstream( const QString& fileName )
|
||||||
|
{
|
||||||
|
return new ofstream( fileName.toStdString().c_str() );
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
QSharedPointer<ostream> logStream;
|
||||||
static int s_threshold = -1;
|
static int s_threshold = -1;
|
||||||
QMutex s_mutex;
|
QMutex s_mutex;
|
||||||
bool shutdownInProgress = false;
|
bool shutdownInProgress = false;
|
||||||
|
|
||||||
|
|
||||||
namespace Logger
|
namespace Logger
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -75,13 +104,13 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
|
|||||||
|
|
||||||
#ifdef LOG_SQL_QUERIES
|
#ifdef LOG_SQL_QUERIES
|
||||||
if ( debugLevel == LOGSQL )
|
if ( debugLevel == LOGSQL )
|
||||||
logStream << "TSQLQUERY: ";
|
*logStream << "TSQLQUERY: ";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ( shutdownInProgress )
|
if ( shutdownInProgress )
|
||||||
{
|
{
|
||||||
// Do not use locales anymore in shutdown
|
// Do not use locales anymore in shutdown
|
||||||
logStream << QDate::currentDate().day() << "."
|
*logStream << QDate::currentDate().day() << "."
|
||||||
<< QDate::currentDate().month() << "."
|
<< QDate::currentDate().month() << "."
|
||||||
<< QDate::currentDate().year() << " - "
|
<< QDate::currentDate().year() << " - "
|
||||||
<< QTime::currentTime().hour() << ":"
|
<< QTime::currentTime().hour() << ":"
|
||||||
@@ -92,14 +121,14 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logStream << QDate::currentDate().toString().toUtf8().data()
|
*logStream << QDate::currentDate().toString().toUtf8().data()
|
||||||
<< " - "
|
<< " - "
|
||||||
<< QTime::currentTime().toString().toUtf8().data()
|
<< QTime::currentTime().toString().toUtf8().data()
|
||||||
<< " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
|
<< " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
|
||||||
<< msg << endl;
|
<< msg << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
logStream.flush();
|
logStream->flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold )
|
if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold )
|
||||||
@@ -187,8 +216,7 @@ setupLogfile(QFile& f)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
f.open(QIODevice::Append | QIODevice::Text);
|
logStream = QSharedPointer<ostream>(open_ofstream(f.fileName()));
|
||||||
logStream.setDevice(&f);
|
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
|
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
|
||||||
qInstallMessageHandler( TomahawkLogHandler );
|
qInstallMessageHandler( TomahawkLogHandler );
|
||||||
|
Reference in New Issue
Block a user