Webserver library - fix logging (#2355) (#2359)

* Webserver fix logging (#1)

* Change logging to use esp32-hal-log.h

fixes #2355

* adjust log parameter output positions, reduce lines

The DEBUG_ESP method used less lines than I originally set `log_v` to use when displaying the details of the received params ("@" and "=" indexes, and File info on a single line)

libraries/WebServer/src/WebServer.cpp

@@ -22,6 +22,7 @@
 
 
 #include <Arduino.h>
+#include <esp32-hal-log.h>
 #include <libb64/cencode.h>
 #include "WiFiServer.h"
 #include "WiFiClient.h"
@@ -30,12 +31,6 @@
 #include "detail/RequestHandlersImpl.h"
 #include "mbedtls/md5.h"
 
-//#define DEBUG_ESP_HTTP_SERVER
-#ifdef DEBUG_ESP_PORT
-#define DEBUG_OUTPUT DEBUG_ESP_PORT
-#else
-#define DEBUG_OUTPUT Serial
-#endif
 
 static const char AUTHORIZATION_HEADER[] = "Authorization";
 static const char qop_auth[] = "qop=auth";
@@ -163,9 +158,7 @@ bool WebServer::authenticate(const char * username, const char * password){
       delete[] encoded;
     } else if(authReq.startsWith(F("Digest"))) {
       authReq = authReq.substring(7);
-      #ifdef DEBUG_ESP_HTTP_SERVER
-      DEBUG_OUTPUT.println(authReq);
-      #endif
+      log_v("%s", authReq.c_str());
       String _username = _extractParam(authReq,F("username=\""));
       if(!_username.length() || _username != String(username)) {
         authReq = "";
@@ -193,9 +186,7 @@ bool WebServer::authenticate(const char * username, const char * password){
         _cnonce = _extractParam(authReq, F("cnonce=\""));
       }
       String _H1 = md5str(String(username) + ':' + _realm + ':' + String(password));
-      #ifdef DEBUG_ESP_HTTP_SERVER
-      DEBUG_OUTPUT.println("Hash of user:realm:pass=" + _H1);
-      #endif
+      log_v("Hash of user:realm:pass=%s", _H1.c_str());
       String _H2 = "";
       if(_currentMethod == HTTP_GET){
           _H2 = md5str(String(F("GET:")) + _uri);
@@ -208,18 +199,14 @@ bool WebServer::authenticate(const char * username, const char * password){
       }else{
           _H2 = md5str(String(F("GET:")) + _uri);
       }
-      #ifdef DEBUG_ESP_HTTP_SERVER
-      DEBUG_OUTPUT.println("Hash of GET:uri=" + _H2);
-      #endif
+      log_v("Hash of GET:uri=%s", _H2.c_str());
       String _responsecheck = "";
       if(authReq.indexOf(FPSTR(qop_auth)) != -1) {
           _responsecheck = md5str(_H1 + ':' + _nonce + ':' + _nc + ':' + _cnonce + F(":auth:") + _H2);
       } else {
           _responsecheck = md5str(_H1 + ':' + _nonce + ':' + _H2);
       }
-      #ifdef DEBUG_ESP_HTTP_SERVER
-      DEBUG_OUTPUT.println("The Proper response=" +_responsecheck);
-      #endif
+      log_v("The Proper response=%s", _responsecheck.c_str());
       if(_response == _responsecheck){
         authReq = "";
         return true;
@@ -294,9 +281,7 @@ void WebServer::handleClient() {
       return;
     }
 
-#ifdef DEBUG_ESP_HTTP_SERVER
-    DEBUG_OUTPUT.println("New client");
-#endif
+    log_v("New client");
 
     _currentClient = client;
     _currentStatus = HC_WAIT_READ;
@@ -614,17 +599,13 @@ void WebServer::onNotFound(THandlerFunction fn) {
 void WebServer::_handleRequest() {
   bool handled = false;
   if (!_currentHandler){
-#ifdef DEBUG_ESP_HTTP_SERVER
-    DEBUG_OUTPUT.println("request handler not found");
-#endif
+    log_e("request handler not found");
   }
   else {
     handled = _currentHandler->handle(*this, _currentMethod, _currentUri);
-#ifdef DEBUG_ESP_HTTP_SERVER
     if (!handled) {
-      DEBUG_OUTPUT.println("request handler failed to handle request");
+      log_e("request handler failed to handle request");
     }
-#endif
   }
   if (!handled && _notFoundHandler) {
     _notFoundHandler();