Skip to content

Commit c9d6f4d

Browse files
committed
Added getEnv to plugins API
1 parent 5f44cc5 commit c9d6f4d

File tree

6 files changed

+18
-3
lines changed

6 files changed

+18
-3
lines changed

python/server/qgsserverinterface.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class QgsServerInterface
2121
virtual QgsRequestHandler* requestHandler( ) = 0 /KeepReference/;
2222
// Tansfer ownership to avoid garbage collector to call dtor
2323
virtual void registerFilter( QgsServerFilter* filter /Transfer/, int priority = 0 ) = 0;
24+
virtual QString getEnv(const QString& name ) const = 0;
2425
// Commented because of problem with typedef QgsServerFiltersMap
2526
// virtual QgsServerFiltersMap filters( ) = 0;
2627

src/mapserver/qgis_map_serv.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void printRequestInfos()
9494
}
9595
if ( getenv( "REMOTE_HOST" ) != NULL )
9696
{
97-
QgsMessageLog::logMessage( "remote ip: " + QString( getenv( "REMOTE_ADDR" ) ), "Server", QgsMessageLog::INFO );
97+
QgsMessageLog::logMessage( "remote ip: " + QString( getenv( "REMOTE_HOST" ) ), "Server", QgsMessageLog::INFO );
9898
}
9999
if ( getenv( "REMOTE_USER" ) != NULL )
100100
{
@@ -326,7 +326,11 @@ int main( int argc, char * argv[] )
326326
// Init plugins
327327
if (! QgsServerPlugins::initPlugins( &serverIface ) )
328328
{
329-
QgsMessageLog::logMessage( "No server plugins are available", "Server", QgsMessageLog::INFO );
329+
QgsMessageLog::logMessage( "No server python plugins are available", "Server", QgsMessageLog::INFO );
330+
}
331+
else
332+
{
333+
QgsMessageLog::logMessage( "Server python plugins loaded", "Server", QgsMessageLog::INFO );
330334
}
331335
// Store plugin filters for faster access
332336
QMultiMap<int, QgsServerFilter*> pluginFilters = serverIface.filters();
@@ -364,6 +368,7 @@ int main( int argc, char * argv[] )
364368
QgsServerFiltersMap::const_iterator filtersIterator;
365369
for( filtersIterator = pluginFilters.constBegin(); filtersIterator != pluginFilters.constEnd(); ++filtersIterator)
366370
{
371+
QgsMessageLog::logMessage( QString("Calling filters priority %1").arg( filtersIterator.key() ), "Server", QgsMessageLog::INFO );
367372
filtersIterator.value()->requestReady();
368373
}
369374
#endif

src/mapserver/qgsserverinterface.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class QgsServerInterface
4646
virtual QgsRequestHandler* requestHandler( ) = 0;
4747
virtual void registerFilter( QgsServerFilter* filter, int priority = 0 ) = 0;
4848
virtual QgsServerFiltersMap filters( ) = 0;
49+
/*Pass environment variables to python*/
50+
virtual QString getEnv(const QString& name ) const = 0;
4951

5052
};
5153

src/mapserver/qgsserverinterfaceimpl.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ QgsServerInterfaceImpl::QgsServerInterfaceImpl( QgsCapabilitiesCache* capCache )
2727
}
2828

2929

30+
QString QgsServerInterfaceImpl::getEnv(const QString& name ) const
31+
{
32+
return getenv( name.toLocal8Bit() );
33+
}
34+
35+
3036
/** Destructor */
3137
QgsServerInterfaceImpl::~QgsServerInterfaceImpl()
3238
{

src/mapserver/qgsserverinterfaceimpl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class QgsServerInterfaceImpl : public QgsServerInterface
4949
QgsRequestHandler* requestHandler( ) { return mRequestHandler; }
5050
void registerFilter( QgsServerFilter *filter, int priority = 0 );
5151
QgsServerFiltersMap filters( ) { return mFilters; }
52+
QString getEnv(const QString& name ) const;
5253

5354
private:
5455

src/mapserver/qgsserverplugins.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ bool QgsServerPlugins::initPlugins(QgsServerInterface *interface)
100100
{
101101
atLeastOneEnabled = TRUE;
102102
mServerPlugins.append( pluginName );
103-
QgsMessageLog::logMessage( QString("Server plugin %1 loaded!").arg( pluginName ), "Server", QgsMessageLog::CRITICAL );
103+
QgsMessageLog::logMessage( QString("Server plugin %1 loaded!").arg( pluginName ), "Server", QgsMessageLog::INFO );
104104
} else {
105105
QgsMessageLog::logMessage( QString("Error loading server plugin %1").arg( pluginName ), "Server", QgsMessageLog::CRITICAL );
106106
}

0 commit comments

Comments
 (0)