diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index 2da8cba..0f4802e 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -42,7 +42,6 @@ #include "user_power.h" #include "main.h" #include "web_data.c" -#include "http_server/web_log.h" static bool is_http_init; static bool is_handlers_registered; diff --git a/TC1/http_server/app_httpd.h b/TC1/http_server/app_httpd.h index 7032b32..7b5490a 100644 --- a/TC1/http_server/app_httpd.h +++ b/TC1/http_server/app_httpd.h @@ -30,10 +30,11 @@ * ****************************************************************************** */ +#include "http_server/web_log.h" #define HTTP_CONTENT_HTML_ZIP "text/html\r\nContent-Encoding: gzip" -#define app_httpd_log(M, ...) custom_log("apphttpd", M, ##__VA_ARGS__) +#define app_httpd_log(M, ...) custom_log("apphttpd", M, ##__VA_ARGS__); web_log(M, ##__VA_ARGS__) #define HTTPD_HDR_DEFORT (HTTPD_HDR_ADD_SERVER|HTTPD_HDR_ADD_CONN_CLOSE|HTTPD_HDR_ADD_PRAGMA_NO_CACHE) diff --git a/TC1/main.c b/TC1/main.c index d592393..bcff0ee 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -9,7 +9,7 @@ #include "mqtt_server/user_function.h" #include "http_server/app_httpd.h" -#define os_log(format, ...) custom_log("TC1", format, ##__VA_ARGS__) +#define os_log(format, ...) custom_log("TC1", format, ##__VA_ARGS__); web_log(format, ##__VA_ARGS__) char rtc_init = 0; //sntp校时成功标志位 uint32_t total_time = 0;