[Server] Layer cache messages

rldhont · rldhont · commit b15d9e49e66c · 2017-03-20T22:26:14.000+01:00
diff --git a/src/server/qgsmslayercache.cpp b/src/server/qgsmslayercache.cpp
@@ -34,6 +34,7 @@ QgsMSLayerCache* QgsMSLayerCache::instance()
 QgsMSLayerCache::QgsMSLayerCache()
     : mProjectMaxLayers( 0 )
 {
+  QgsMessageLog::logMessage( "QgsMSLayerCache initialized", "Server", QgsMessageLog::INFO );
   mDefaultMaxLayers = 100;
   //max layer from environment variable overrides default
   char* maxLayerEnv = getenv( "MAX_CACHE_LAYERS" );
@@ -61,7 +62,7 @@ QgsMSLayerCache::~QgsMSLayerCache()
 
 void QgsMSLayerCache::insertLayer( const QString& url, const QString& layerName, QgsMapLayer* layer, const QString& configFile, const QList<QString>& tempFiles )
 {
-  QgsMessageLog::logMessage( "Layer cache: insert Layer '" + layerName + "' configFile: " + configFile, "Server", QgsMessageLog::INFO );
+  QgsMessageLog::logMessage( "Layer cache: insert Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile, "Server", QgsMessageLog::INFO );
   if ( mEntries.size() > qMax( mDefaultMaxLayers, mProjectMaxLayers ) ) //force cache layer examination after 10 inserted layers
   {
     updateEntries();
@@ -100,7 +101,7 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la
   QPair<QString, QString> urlNamePair = qMakePair( url, layerName );
   if ( !mEntries.contains( urlNamePair ) )
   {
-    QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );
+    QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );
     return nullptr;
   }
   else
@@ -112,11 +113,11 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la
       if ( configFile.isEmpty() || layerIt->configFile == configFile )
       {
         layerIt->lastUsedTime = time( nullptr );
-        QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " found in layer cache", "Server", QgsMessageLog::INFO );
+        QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " found in layer cache", "Server", QgsMessageLog::INFO );
         return layerIt->layerPointer;
       }
     }
-    QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );
+    QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );
     return nullptr;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ QgsMSLayerCache* QgsMSLayerCache::instance()`
`34`	`34`	`QgsMSLayerCache::QgsMSLayerCache()`
`35`	`35`	`: mProjectMaxLayers( 0 )`
`36`	`36`	`{`
	`37`	`+ QgsMessageLog::logMessage( "QgsMSLayerCache initialized", "Server", QgsMessageLog::INFO );`
`37`	`38`	`mDefaultMaxLayers = 100;`
`38`	`39`	`//max layer from environment variable overrides default`
`39`	`40`	`char* maxLayerEnv = getenv( "MAX_CACHE_LAYERS" );`
`@@ -61,7 +62,7 @@ QgsMSLayerCache::~QgsMSLayerCache()`
`61`	`62`
`62`	`63`	`void QgsMSLayerCache::insertLayer( const QString& url, const QString& layerName, QgsMapLayer* layer, const QString& configFile, const QList<QString>& tempFiles )`
`63`	`64`	`{`
`64`		`- QgsMessageLog::logMessage( "Layer cache: insert Layer '" + layerName + "' configFile: " + configFile, "Server", QgsMessageLog::INFO );`
	`65`	`+ QgsMessageLog::logMessage( "Layer cache: insert Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile, "Server", QgsMessageLog::INFO );`
`65`	`66`	`if ( mEntries.size() > qMax( mDefaultMaxLayers, mProjectMaxLayers ) ) //force cache layer examination after 10 inserted layers`
`66`	`67`	`{`
`67`	`68`	`updateEntries();`
`@@ -100,7 +101,7 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la`
`100`	`101`	`QPair<QString, QString> urlNamePair = qMakePair( url, layerName );`
`101`	`102`	`if ( !mEntries.contains( urlNamePair ) )`
`102`	`103`	`{`
`103`		`- QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );`
	`104`	`+ QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );`
`104`	`105`	`return nullptr;`
`105`	`106`	`}`
`106`	`107`	`else`
`@@ -112,11 +113,11 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la`
`112`	`113`	`if ( configFile.isEmpty() \|\| layerIt->configFile == configFile )`
`113`	`114`	`{`
`114`	`115`	`layerIt->lastUsedTime = time( nullptr );`
`115`		`- QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " found in layer cache", "Server", QgsMessageLog::INFO );`
	`116`	`+ QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " found in layer cache", "Server", QgsMessageLog::INFO );`
`116`	`117`	`return layerIt->layerPointer;`
`117`	`118`	`}`
`118`	`119`	`}`
`119`		`- QgsMessageLog::logMessage( "Layer '" + layerName + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );`
	`120`	`+ QgsMessageLog::logMessage( "Layer '" + layerName + "' url: '" + url + "' configFile: " + configFile + " not found in layer cache'", "Server", QgsMessageLog::INFO );`
`120`	`121`	`return nullptr;`
`121`	`122`	`}`
`122`	`123`	`}`