Fix missing http_proxy in managment handler

3liz · Dec 1, 2022 · 76b4670 · 76b4670
1 parent e7ea611
commit 76b4670
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ## Unreleased
 
+### Fixed
+
+* Fix Fix missing http_proxy in managment handler
+
 ### Added
 
 * Add informative warning on dangling plugin symlink

diff --git a/pyqgisserver/config.py b/pyqgisserver/config.py
@@ -99,7 +99,6 @@ def load_configuration():
     CONFIG.set('api.enabled', 'lizmap_api', getenv('QGSRV_API_ENABLED_LIZMAP','no'))
 
     # Landing page config mapping
-    # see: https://github.com/qgis/QGIS/pull/38189#issuecomment-875682735
     CONFIG.add_section('api:landing_page')
     CONFIG.set('api:landing_page', 'QGIS_SERVER_LANDING_PAGE_PREFIX', 
                '${api.endpoints:landing_page}')

diff --git a/pyqgisserver/handlers/basehandler.py b/pyqgisserver/handlers/basehandler.py
@@ -53,7 +53,7 @@ def on_connection_close(self) -> None:
         self.logger.warning("Connection closed by client: {}".format(self.request.uri))
 
     def set_option_headers(self, allow_header: Optional[str]=None) -> None:
-        """  Set correct headers for 'OPTION' method
+        """  Set correct headers for 'OPTIONS' method
         """
         if not allow_header:
             allow_header = ', '.join( me for me in self.SUPPORTED_METHODS if hasattr(self, me.lower()) )

diff --git a/pyqgisserver/management/server.py b/pyqgisserver/management/server.py
@@ -177,6 +177,7 @@ def __init__(self, poolserver, router: str) -> None:
         super().__init__(configure_handlers(poolserver, self._broker_client),
                          default_handler_class=NotFoundHandler)
 
+        self.http_proxy = confservice.getboolean('server','http_proxy')
 
     def log_request(self, handler: tornado.web.RequestHandler ) -> None:
         """ Write HTTP requet to the logs

diff --git a/pyqgisserver/utils/qgis.py b/pyqgisserver/utils/qgis.py
@@ -137,7 +137,7 @@ def set_proxy_configuration( logger: logging.Logger ) -> None:
     if proxy_type == QNetworkProxy.NoProxy:
         return
 
-    logger.info("Proxy configuration enabled: %s:%s, type: %s",
+    logger.info("QGIS Proxy configuration enabled: %s:%s, type: %s",
                 proxy.hostName(), proxy.port(), 
                 { QNetworkProxy.DefaultProxy:    'DefaultProxy',
                   QNetworkProxy.Socks5Proxy:     'Socks5Proxy' ,