From 2c56c6cad8a2c339dffe39b15243b45daf49ca2a Mon Sep 17 00:00:00 2001 From: Harshit Malpani Date: Mon, 9 May 2022 14:57:51 +0530 Subject: [PATCH] Updated coding style and added error logs --- .../esp_local_ctrl/src/esp_local_ctrl_transport_httpd.c | 3 ++- components/protocomm/src/transports/protocomm_httpd.c | 4 +++- .../protocols/http_server/persistent_sockets/main/main.c | 5 ++++- examples/protocols/http_server/simple/main/main.c | 5 ++++- .../http_server/ws_echo_server/main/ws_echo_server.c | 5 ++++- examples/protocols/https_server/simple/main/main.c | 5 ++++- .../https_server/wss_server/main/wss_server_example.c | 5 ++++- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/components/esp_local_ctrl/src/esp_local_ctrl_transport_httpd.c b/components/esp_local_ctrl/src/esp_local_ctrl_transport_httpd.c index e4371ffd90..80ef346a4c 100644 --- a/components/esp_local_ctrl/src/esp_local_ctrl_transport_httpd.c +++ b/components/esp_local_ctrl/src/esp_local_ctrl_transport_httpd.c @@ -77,8 +77,9 @@ static void stop_httpd_transport(protocomm_t *pc) { mdns_service_remove("_esp_local_ctrl", "_tcp"); protocomm_httpd_stop(pc); - if (httpd_ssl_stop(server_handle) == ESP_OK) + if (httpd_ssl_stop(server_handle) == ESP_OK) { server_handle = NULL; + } } static esp_err_t copy_httpd_config(esp_local_ctrl_transport_config_t *dest_config, const esp_local_ctrl_transport_config_t *src_config) diff --git a/components/protocomm/src/transports/protocomm_httpd.c b/components/protocomm/src/transports/protocomm_httpd.c index 980a69b8f6..33a4337141 100644 --- a/components/protocomm/src/transports/protocomm_httpd.c +++ b/components/protocomm/src/transports/protocomm_httpd.c @@ -296,8 +296,10 @@ esp_err_t protocomm_httpd_stop(protocomm_t *pc) if (!pc_ext_httpd_handle_provided) { httpd_handle_t *server_handle = (httpd_handle_t *) pc_httpd->priv; esp_err_t ret = httpd_stop(*server_handle); - if (ret != ESP_OK) + if (ret != ESP_OK) { + ESP_LOGE(TAG, "Failed to stop http server"); return ret; + } free(server_handle); } else { pc_ext_httpd_handle_provided = false; diff --git a/examples/protocols/http_server/persistent_sockets/main/main.c b/examples/protocols/http_server/persistent_sockets/main/main.c index 7474a40228..e70745b34f 100644 --- a/examples/protocols/http_server/persistent_sockets/main/main.c +++ b/examples/protocols/http_server/persistent_sockets/main/main.c @@ -195,8 +195,11 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base, httpd_handle_t* server = (httpd_handle_t*) arg; if (*server) { ESP_LOGI(TAG, "Stopping webserver"); - if (stop_webserver(*server) == ESP_OK) + if (stop_webserver(*server) == ESP_OK) { *server = NULL; + } else { + ESP_LOGE(TAG, "Failed to stop http server"); + } } } diff --git a/examples/protocols/http_server/simple/main/main.c b/examples/protocols/http_server/simple/main/main.c index 2ce0ab5842..1ec5757c08 100644 --- a/examples/protocols/http_server/simple/main/main.c +++ b/examples/protocols/http_server/simple/main/main.c @@ -374,8 +374,11 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base, httpd_handle_t* server = (httpd_handle_t*) arg; if (*server) { ESP_LOGI(TAG, "Stopping webserver"); - if (stop_webserver(*server) == ESP_OK) + if (stop_webserver(*server) == ESP_OK) { *server = NULL; + } else { + ESP_LOGE(TAG, "Failed to stop http server"); + } } } diff --git a/examples/protocols/http_server/ws_echo_server/main/ws_echo_server.c b/examples/protocols/http_server/ws_echo_server/main/ws_echo_server.c index c1c05579ee..c8789f73f3 100644 --- a/examples/protocols/http_server/ws_echo_server/main/ws_echo_server.c +++ b/examples/protocols/http_server/ws_echo_server/main/ws_echo_server.c @@ -152,8 +152,11 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base, httpd_handle_t* server = (httpd_handle_t*) arg; if (*server) { ESP_LOGI(TAG, "Stopping webserver"); - if (stop_webserver(*server) == ESP_OK) + if (stop_webserver(*server) == ESP_OK) { *server = NULL; + } else { + ESP_LOGE(TAG, "Failed to stop http server"); + } } } diff --git a/examples/protocols/https_server/simple/main/main.c b/examples/protocols/https_server/simple/main/main.c index 9846a40021..8870a1608a 100644 --- a/examples/protocols/https_server/simple/main/main.c +++ b/examples/protocols/https_server/simple/main/main.c @@ -150,8 +150,11 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base, { httpd_handle_t* server = (httpd_handle_t*) arg; if (*server) { - if (stop_webserver(*server) == ESP_OK) + if (stop_webserver(*server) == ESP_OK) { *server = NULL; + } else { + ESP_LOGE(TAG, "Failed to stop https server"); + } } } diff --git a/examples/protocols/https_server/wss_server/main/wss_server_example.c b/examples/protocols/https_server/wss_server/main/wss_server_example.c index e33b137bb5..a57eb04557 100644 --- a/examples/protocols/https_server/wss_server/main/wss_server_example.c +++ b/examples/protocols/https_server/wss_server/main/wss_server_example.c @@ -219,8 +219,11 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base, { httpd_handle_t* server = (httpd_handle_t*) arg; if (*server) { - if (stop_wss_echo_server(*server) == ESP_OK) + if (stop_wss_echo_server(*server) == ESP_OK) { *server = NULL; + } else { + ESP_LOGE(TAG, "Failed to stop https server"); + } } }