Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[FEATURE]: File log in server also if server executable is compiled i…
…n release mode
- Loading branch information
Showing
with
181 additions
and 34 deletions.
- +2 −0 src/mapserver/CMakeLists.txt
- +45 −30 src/mapserver/qgis_map_serv.cpp
- +11 −4 src/mapserver/qgsconfigcache.cpp
- +71 −0 src/mapserver/qgsserverlogger.cpp
- +52 −0 src/mapserver/qgsserverlogger.h
There are no files selected for viewing
| @@ -0,0 +1,71 @@ | ||
| /*************************************************************************** | ||
| qgsserverlogger.cpp | ||
| ------------------- | ||
| begin : May 5, 2014 | ||
| copyright : (C) 2014 by Marco Hugentobler | ||
| email : marco dot hugentobler at sourcepole dot ch | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "qgsserverlogger.h" | ||
| #include <QCoreApplication> | ||
| #include <QFile> | ||
| #include <QTextStream> | ||
| #include <QTime> | ||
|
|
||
| QgsServerLogger* QgsServerLogger::mInstance = 0; | ||
|
|
||
| QgsServerLogger* QgsServerLogger::instance() | ||
| { | ||
| if ( mInstance == 0 ) | ||
| { | ||
| mInstance = new QgsServerLogger(); | ||
| } | ||
| return mInstance; | ||
| } | ||
|
|
||
| QgsServerLogger::QgsServerLogger(): mLogFile( 0 ) | ||
| { | ||
| //logfile | ||
| QString filePath = getenv( "QGIS_LOG_FILE" ); | ||
| mLogFile.setFileName( filePath ); | ||
| if ( mLogFile.open( QIODevice::Append ) ) | ||
| { | ||
| mTextStream.setDevice( &mLogFile ); | ||
| } | ||
|
|
||
| //log level | ||
| char* logLevelChar = getenv( "QGIS_LOG_LEVEL" ); | ||
| if ( logLevelChar ) | ||
| { | ||
| mLogLevel = atoi( logLevelChar ); | ||
| } | ||
| else | ||
| { | ||
| mLogLevel = 3; | ||
| } | ||
|
|
||
| connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, QgsMessageLog::MessageLevel ) ), this, | ||
| SLOT( logMessage( QString, QString, QgsMessageLog::MessageLevel ) ) ); | ||
| } | ||
|
|
||
| void QgsServerLogger::logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ) | ||
| { | ||
| Q_UNUSED( tag ); | ||
| if ( !mLogFile.isOpen() || mLogLevel > level ) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| mTextStream << ( "[" + QString::number( qlonglong( QCoreApplication::applicationPid() ) ) + "][" | ||
| + QTime::currentTime().toString() + "] " + message + "\n" ); | ||
| mTextStream.flush(); | ||
| } |
| @@ -0,0 +1,52 @@ | ||
| /*************************************************************************** | ||
| qgsserverlogger.h | ||
| ----------------- | ||
| begin : May 5, 2014 | ||
| copyright : (C) 2014 by Marco Hugentobler | ||
| email : marco dot hugentobler at sourcepole dot ch | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #ifndef QGSSERVERLOGGER_H | ||
| #define QGSSERVERLOGGER_H | ||
|
|
||
| #include "qgsmessagelog.h" | ||
|
|
||
| #include <QFile> | ||
| #include <QObject> | ||
| #include <QString> | ||
| #include <QTextStream> | ||
|
|
||
| /**Writes message log into server logfile*/ | ||
| class QgsServerLogger: public QObject | ||
| { | ||
| Q_OBJECT | ||
| public: | ||
| static QgsServerLogger* instance(); | ||
|
|
||
| int logLevel() const { return mLogLevel; } | ||
| //QString logFile() const { return mLogFile; } | ||
|
|
||
| public slots: | ||
| void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ); | ||
|
|
||
| protected: | ||
| QgsServerLogger(); | ||
|
|
||
| private: | ||
| static QgsServerLogger* mInstance; | ||
|
|
||
| QFile mLogFile; | ||
| QTextStream mTextStream; | ||
| int mLogLevel; | ||
| }; | ||
|
|
||
| #endif // QGSSERVERLOGGER_H |