@@ -81,7 +81,6 @@ QgsServer::QgsServer( bool captureOutput )
81
81
}
82
82
sCaptureOutput = captureOutput;
83
83
init ();
84
- saveEnvVars ();
85
84
}
86
85
87
86
@@ -179,9 +178,9 @@ QFileInfo QgsServer::defaultProjectFile()
179
178
* @param parameterMap
180
179
* @param logLevel
181
180
*/
182
- void QgsServer::printRequestParameters ( const QMap< QString, QString>& parameterMap, int logLevel )
181
+ void QgsServer::printRequestParameters ( const QMap< QString, QString>& parameterMap, QgsMessageLog::MessageLevel logLevel )
183
182
{
184
- if ( logLevel > 0 )
183
+ if ( logLevel > QgsMessageLog::INFO )
185
184
{
186
185
return ;
187
186
}
@@ -241,38 +240,6 @@ void QgsServer::printRequestInfos()
241
240
}
242
241
}
243
242
244
- void QgsServer::dummyMessageHandler ( QtMsgType type, const char *msg )
245
- {
246
- #if 0 //def QGSMSDEBUG
247
- QString output;
248
-
249
- switch ( type )
250
- {
251
- case QtDebugMsg:
252
- output += "Debug: ";
253
- break;
254
- case QtCriticalMsg:
255
- output += "Critical: ";
256
- break;
257
- case QtWarningMsg:
258
- output += "Warning: ";
259
- break;
260
- case QtFatalMsg:
261
- output += "Fatal: ";
262
- }
263
-
264
- output += msg;
265
-
266
- QgsLogger::logMessageToFile( output );
267
-
268
- if ( type == QtFatalMsg )
269
- abort();
270
- #else
271
- Q_UNUSED ( type );
272
- Q_UNUSED ( msg );
273
- #endif
274
- }
275
-
276
243
/* *
277
244
* @brief QgsServer::configPath
278
245
* @param defaultConfigPath
@@ -317,10 +284,6 @@ bool QgsServer::init( )
317
284
318
285
QgsServerLogger::instance ();
319
286
320
- #ifndef _MSC_VER
321
- qInstallMsgHandler ( dummyMessageHandler );
322
- #endif
323
-
324
287
QString optionsPath = getenv ( " QGIS_OPTIONS_PATH" );
325
288
if ( !optionsPath.isEmpty () )
326
289
{
@@ -420,27 +383,20 @@ void QgsServer::putenv( const QString &var, const QString &val )
420
383
*/
421
384
QPair<QByteArray, QByteArray> QgsServer::handleRequest ( const QString& queryString )
422
385
{
423
- // apply environment variables
424
- QHash< QString, QString >::const_iterator envIt = mEnvironmentVariables .constBegin ();
425
- for ( ; envIt != mEnvironmentVariables .constEnd (); ++envIt )
426
- {
427
- putenv ( envIt.key (), envIt.value () );
428
- }
429
-
430
386
/*
431
387
* This is mainly for python bindings, passing QUERY_STRING
432
388
* to handleRequest without using os.environment
433
389
*/
434
390
if ( ! queryString.isEmpty () )
435
391
putenv ( QStringLiteral ( " QUERY_STRING" ), queryString );
436
392
437
- int logLevel = QgsServerLogger::instance ()->logLevel ();
393
+ QgsMessageLog::MessageLevel logLevel = QgsServerLogger::instance ()->logLevel ();
438
394
QTime time ; // used for measuring request time if loglevel < 1
439
395
QgsProject::instance ()->removeAllMapLayers ();
440
396
441
397
qApp->processEvents ();
442
398
443
- if ( logLevel < 1 )
399
+ if ( logLevel == QgsMessageLog::INFO )
444
400
{
445
401
time .start ();
446
402
printRequestInfos ();
@@ -614,7 +570,7 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri
614
570
615
571
theRequestHandler->sendResponse ();
616
572
617
- if ( logLevel < 1 )
573
+ if ( logLevel == QgsMessageLog::INFO )
618
574
{
619
575
QgsMessageLog::logMessage ( " Request finished in " + QString::number ( time .elapsed () ) + " ms" , QStringLiteral ( " Server" ), QgsMessageLog::INFO );
620
576
}
@@ -637,28 +593,3 @@ void QgsServer::initPython()
637
593
}
638
594
#endif
639
595
640
- #if 0
641
- // The following code was used to test type conversion in python bindings
642
- QPair<QByteArray, QByteArray> QgsServer::testQPair( QPair<QByteArray, QByteArray> pair )
643
- {
644
- return pair;
645
- }
646
- #endif
647
-
648
- void QgsServer::saveEnvVars ()
649
- {
650
- saveEnvVar ( QStringLiteral ( " MAX_CACHE_LAYERS" ) );
651
- saveEnvVar ( QStringLiteral ( " DEFAULT_DATUM_TRANSFORM" ) );
652
- }
653
-
654
- void QgsServer::saveEnvVar ( const QString& variableName )
655
- {
656
- const char * env = getenv ( variableName.toLocal8Bit () );
657
- if ( !env )
658
- {
659
- return ;
660
- }
661
-
662
- mEnvironmentVariables .insert ( variableName, QString::fromLocal8Bit ( env ) );
663
- }
664
-
0 commit comments