revert changes

qgis · Dec 6, 2024 · d031943 · d031943
1 parent 3388c32
commit d031943
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -17,7 +17,6 @@ ccache -z
 ccache --set-config sloppiness=pch_defines,time_macros,include_file_mtime,include_file_ctime
 
 cmake -GNinja \
-      -DCMAKE_BUILD_TYPE=Debug \
  -DUSE_CCACHE=ON \
  -DWITH_QUICK=OFF \
  -DWITH_3D=OFF \

diff --git a/.ci/ogc/docker-compose.yml b/.ci/ogc/docker-compose.yml
@@ -23,9 +23,6 @@ services:
     networks:
       - qgis
     privileged: true
-    environment:
-      QGIS_DEBUG: 5
-
 
 networks:
   qgis:

diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml
@@ -81,16 +81,15 @@ jobs:
       - name: Install pyogctest
         run: |
           sudo apt-get update && sudo apt-get install python3-virtualenv virtualenv git
-          git clone https://github.com/benoitdm-oslandia/pyogctest
-          cd pyogctest && git checkout fix/docker_ulimit && cd -
+          git clone https://github.com/pblottiere/pyogctest
+          cd pyogctest && git checkout 1.1.1 && cd -
           virtualenv -p /usr/bin/python3 venv && source venv/bin/activate && pip install -e pyogctest/
 
       - name: Run WMS 1.3.0 OGC tests
         run: |
           source venv/bin/activate && ./pyogctest/pyogctest.py -s wms130 -e
           docker compose -f .ci/ogc/docker-compose.yml up -d
-          docker compose -f .ci/ogc/docker-compose.yml logs -f &
-          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -d -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_wms130
+          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_wms130
         env:
           DOCKER_IMAGE: ${{ steps.docker-build.outputs.imageid }}
 

diff --git a/src/server/qgis_map_serv.cpp b/src/server/qgis_map_serv.cpp
@@ -97,7 +97,7 @@ int main( int argc, char *argv[] )
       response.sendError( 400, "Bad request" );
     }
   }
-  QgsDebugMsgLevel( QStringLiteral( "FCGIServer: main quits." ), 2 );
   QgsApplication::exitQgis();
   return 0;
 }
+
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -51,6 +51,7 @@
 // TODO: remove, it's only needed by a single debug message
 #include <fcgi_stdio.h>
 #include <cstdlib>
+#include <QThread>
 
 
 // Server status static initializers.
@@ -461,6 +462,8 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res
       QgsMessageLog::logMessage( ex.what(), QStringLiteral( "Server" ), Qgis::MessageLevel::Critical );
     }
 
+    QThread::msleep( rand() % 2000 );
+
     // Plugins may have set exceptions
     if ( !requestHandler.exceptionRaised() )
     {