rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-03 08:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced all of the logging with proper log levels

Browse Source
This commit is contained in:
Ben Meadors
2022-12-30 10:27:07 -06:00
parent 8193215294
commit f1cdfd163d
68 changed files with 519 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesh/http/ContentHandler.cpp
View File

@@ -335,7 +335,7 @@ void handleFsDeleteStatic(HTTPRequest *req, HTTPResponse *res)
if (params->getQueryParameter("delete", paramValDelete)) {
std::string pathDelete = "/" + paramValDelete;
if (FSCom.remove(pathDelete.c_str())) {
Serial.println(pathDelete.c_str());
LOG_INFO("%s\n", pathDelete.c_str());
JSONObject jsonObjOuter;
jsonObjOuter["status"] = new JSONValue("ok");
JSONValue *value = new JSONValue(jsonObjOuter);
@@ -343,7 +343,7 @@ void handleFsDeleteStatic(HTTPRequest *req, HTTPResponse *res)
delete value;
return;
} else {
Serial.println(pathDelete.c_str());
LOG_INFO("%s\n", pathDelete.c_str());
JSONObject jsonObjOuter;
jsonObjOuter["status"] = new JSONValue("Error");
JSONValue *value = new JSONValue(jsonObjOuter);
@@ -379,13 +379,13 @@ void handleStatic(HTTPRequest *req, HTTPResponse *res)
if (FSCom.exists(filename.c_str())) {
file = FSCom.open(filename.c_str());
if (!file.available()) {
LOG_DEBUG("File not available - %s\n", filename.c_str());
LOG_WARN("File not available - %s\n", filename.c_str());
}
} else if (FSCom.exists(filenameGzip.c_str())) {
file = FSCom.open(filenameGzip.c_str());
res->setHeader("Content-Encoding", "gzip");
if (!file.available()) {
LOG_DEBUG("File not available - %s\n", filenameGzip.c_str());
LOG_WARN("File not available - %s\n", filenameGzip.c_str());
}
} else {
has_set_content_type = true;
@@ -393,7 +393,7 @@ void handleStatic(HTTPRequest *req, HTTPResponse *res)
file = FSCom.open(filenameGzip.c_str());
res->setHeader("Content-Type", "text/html");
if (!file.available()) {
LOG_DEBUG("File not available - %s\n", filenameGzip.c_str());
LOG_WARN("File not available - %s\n", filenameGzip.c_str());
res->println("Web server is running.<br><br>The content you are looking for can't be found. Please see: <a "
"href=https://meshtastic.org/docs/getting-started/faq#wifi--web-browser>FAQ</a>.<br><br><a "
"href=/admin>admin</a>");
@@ -437,7 +437,7 @@ void handleStatic(HTTPRequest *req, HTTPResponse *res)
return;
} else {
LOG_DEBUG("ERROR: This should not have happened...\n");
LOG_ERROR("This should not have happened...\n");
res->println("ERROR: This should not have happened...");
}
}
@@ -472,7 +472,7 @@ void handleFormUpload(HTTPRequest *req, HTTPResponse *res)
LOG_DEBUG("Form Upload - multipart/form-data\n");
parser = new HTTPMultipartBodyParser(req);
} else {
Serial.printf("Unknown POST Content-Type: %s\n", contentType.c_str());
LOG_DEBUG("Unknown POST Content-Type: %s\n", contentType.c_str());
return;
}
@@ -671,7 +671,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
*/
void handleHotspot(HTTPRequest *req, HTTPResponse *res)
{
LOG_DEBUG("Hotspot Request\n");
LOG_INFO("Hotspot Request\n");
/*
If we don't do a redirect, be sure to return a "Success" message
@@ -697,7 +697,7 @@ void handleDeleteFsContent(HTTPRequest *req, HTTPResponse *res)
res->println("<h1>Meshtastic</h1>\n");
res->println("Deleting Content in /static/*");
LOG_DEBUG("Deleting files from /static/* : \n");
LOG_INFO("Deleting files from /static/* : \n");
htmlDeleteDir("/static");

20
src/mesh/http/WebServer.cpp
View File

@@ -74,13 +74,13 @@ static void taskCreateCert(void *parameter)
prefs.remove("cert");
#endif
LOG_DEBUG("Checking if we have a previously saved SSL Certificate.\n");
LOG_INFO("Checking if we have a previously saved SSL Certificate.\n");
size_t pkLen = prefs.getBytesLength("PK");
size_t certLen = prefs.getBytesLength("cert");
if (pkLen && certLen) {
LOG_DEBUG("Existing SSL Certificate found!\n");
LOG_INFO("Existing SSL Certificate found!\n");
uint8_t *pkBuffer = new uint8_t[pkLen];
prefs.getBytes("PK", pkBuffer, pkLen);
@@ -95,7 +95,7 @@ static void taskCreateCert(void *parameter)
} else {
LOG_DEBUG("Creating the certificate. This may take a while. Please wait...\n");
LOG_INFO("Creating the certificate. This may take a while. Please wait...\n");
yield();
cert = new SSLCert();
yield();
@@ -104,10 +104,10 @@ static void taskCreateCert(void *parameter)
yield();
if (createCertResult != 0) {
LOG_DEBUG("Creating the certificate failed\n");
LOG_ERROR("Creating the certificate failed\n");
} else {
LOG_DEBUG("Creating the certificate was successful\n");
LOG_INFO("Creating the certificate was successful\n");
LOG_DEBUG("Created Private Key: %d Bytes\n", cert->getPKLength());
@@ -159,7 +159,7 @@ void createSSLCert()
runLoop = true;
}
}
LOG_DEBUG("SSL Cert Ready!\n");
LOG_INFO("SSL Cert Ready!\n");
}
}
@@ -191,15 +191,15 @@ void initWebServer()
registerHandlers(insecureServer, secureServer);
if (secureServer) {
LOG_DEBUG("Starting Secure Web Server...\n");
LOG_INFO("Starting Secure Web Server...\n");
secureServer->start();
}
LOG_DEBUG("Starting Insecure Web Server...\n");
LOG_INFO("Starting Insecure Web Server...\n");
insecureServer->start();
if (insecureServer->isRunning()) {
LOG_DEBUG("Web Servers Ready! :-) \n");
LOG_INFO("Web Servers Ready! :-) \n");
isWebServerReady = true;
} else {
LOG_DEBUG("Web Servers Failed! ;-( \n");
LOG_ERROR("Web Servers Failed! ;-( \n");
}
}

103
src/mesh/http/WiFiAPClient.cpp
View File

@@ -56,7 +56,7 @@ static int32_t reconnectWiFi()
// Make sure we clear old connection credentials
WiFi.disconnect(false, true);
LOG_DEBUG("Reconnecting to WiFi access point %s\n",wifiName);
LOG_INFO("Reconnecting to WiFi access point %s\n",wifiName);
WiFi.mode(WIFI_MODE_STA);
WiFi.begin(wifiName, wifiPsw);
@@ -101,12 +101,12 @@ bool isWifiAvailable()
// Disable WiFi
void deinitWifi()
{
LOG_DEBUG("WiFi deinit\n");
LOG_INFO("WiFi deinit\n");
if (isWifiAvailable()) {
WiFi.disconnect(true);
WiFi.mode(WIFI_MODE_NULL);
LOG_DEBUG("WiFi Turned Off\n");
LOG_INFO("WiFi Turned Off\n");
// WiFi.printDiag(Serial);
}
}
@@ -115,20 +115,20 @@ static void onNetworkConnected()
{
if (!APStartupComplete) {
// Start web server
LOG_DEBUG("Starting network services\n");
LOG_INFO("Starting network services\n");
// start mdns
if (!MDNS.begin("Meshtastic")) {
LOG_DEBUG("Error setting up MDNS responder!\n");
LOG_ERROR("Error setting up MDNS responder!\n");
} else {
LOG_DEBUG("mDNS responder started\n");
LOG_DEBUG("mDNS Host: Meshtastic.local\n");
LOG_INFO("mDNS responder started\n");
LOG_INFO("mDNS Host: Meshtastic.local\n");
MDNS.addService("http", "tcp", 80);
MDNS.addService("https", "tcp", 443);
}
#ifndef DISABLE_NTP
LOG_DEBUG("Starting NTP time client\n");
LOG_INFO("Starting NTP time client\n");
timeClient.begin();
timeClient.setUpdateInterval(60 * 60); // Update once an hour
#endif
@@ -182,8 +182,7 @@ bool initWifi()
WiFi.onEvent(
[](WiFiEvent_t event, WiFiEventInfo_t info) {
Serial.print("WiFi lost connection. Reason: ");
Serial.println(info.wifi_sta_disconnected.reason);
LOG_WARN("WiFi lost connection. Reason: %s", info.wifi_sta_disconnected.reason);
/*
If we are disconnected from the AP for some reason,
@@ -201,7 +200,7 @@ bool initWifi()
}
return true;
} else {
LOG_DEBUG("Not using WIFI\n");
LOG_INFO("Not using WIFI\n");
return false;
}
}
@@ -213,133 +212,131 @@ static void WiFiEvent(WiFiEvent_t event)
switch (event) {
case ARDUINO_EVENT_WIFI_READY:
LOG_DEBUG("WiFi interface ready\n");
LOG_INFO("WiFi interface ready\n");
break;
case ARDUINO_EVENT_WIFI_SCAN_DONE:
LOG_DEBUG("Completed scan for access points\n");
LOG_INFO("Completed scan for access points\n");
break;
case ARDUINO_EVENT_WIFI_STA_START:
LOG_DEBUG("WiFi station started\n");
LOG_INFO("WiFi station started\n");
break;
case ARDUINO_EVENT_WIFI_STA_STOP:
LOG_DEBUG("WiFi station stopped\n");
LOG_INFO("WiFi station stopped\n");
break;
case ARDUINO_EVENT_WIFI_STA_CONNECTED:
LOG_DEBUG("Connected to access point\n");
LOG_INFO("Connected to access point\n");
break;
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
LOG_DEBUG("Disconnected from WiFi access point\n");
LOG_INFO("Disconnected from WiFi access point\n");
WiFi.disconnect(false, true);
needReconnect = true;
wifiReconnect->setIntervalFromNow(1000);
break;
case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE:
LOG_DEBUG("Authentication mode of access point has changed\n");
LOG_INFO("Authentication mode of access point has changed\n");
break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
LOG_DEBUG("Obtained IP address: ");
Serial.println(WiFi.localIP());
LOG_INFO("Obtained IP address: ", WiFi.localIPv6());
onNetworkConnected();
break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
LOG_DEBUG("Obtained IP6 address: ");
Serial.println(WiFi.localIPv6());
LOG_INFO("Obtained IP6 address: %s", WiFi.localIPv6());
break;
case ARDUINO_EVENT_WIFI_STA_LOST_IP:
LOG_DEBUG("Lost IP address and IP address is reset to 0\n");
LOG_INFO("Lost IP address and IP address is reset to 0\n");
WiFi.disconnect(false, true);
needReconnect = true;
wifiReconnect->setIntervalFromNow(1000);
break;
case ARDUINO_EVENT_WPS_ER_SUCCESS:
LOG_DEBUG("WiFi Protected Setup (WPS): succeeded in enrollee mode\n");
LOG_INFO("WiFi Protected Setup (WPS): succeeded in enrollee mode\n");
break;
case ARDUINO_EVENT_WPS_ER_FAILED:
LOG_DEBUG("WiFi Protected Setup (WPS): failed in enrollee mode\n");
LOG_INFO("WiFi Protected Setup (WPS): failed in enrollee mode\n");
break;
case ARDUINO_EVENT_WPS_ER_TIMEOUT:
LOG_DEBUG("WiFi Protected Setup (WPS): timeout in enrollee mode\n");
LOG_INFO("WiFi Protected Setup (WPS): timeout in enrollee mode\n");
break;
case ARDUINO_EVENT_WPS_ER_PIN:
LOG_DEBUG("WiFi Protected Setup (WPS): pin code in enrollee mode\n");
LOG_INFO("WiFi Protected Setup (WPS): pin code in enrollee mode\n");
break;
case ARDUINO_EVENT_WPS_ER_PBC_OVERLAP:
LOG_DEBUG("WiFi Protected Setup (WPS): push button overlap in enrollee mode\n");
LOG_INFO("WiFi Protected Setup (WPS): push button overlap in enrollee mode\n");
break;
case ARDUINO_EVENT_WIFI_AP_START:
LOG_DEBUG("WiFi access point started\n");
LOG_INFO("WiFi access point started\n");
break;
case ARDUINO_EVENT_WIFI_AP_STOP:
LOG_DEBUG("WiFi access point stopped\n");
LOG_INFO("WiFi access point stopped\n");
break;
case ARDUINO_EVENT_WIFI_AP_STACONNECTED:
LOG_DEBUG("Client connected\n");
LOG_INFO("Client connected\n");
break;
case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED:
LOG_DEBUG("Client disconnected\n");
LOG_INFO("Client disconnected\n");
break;
case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED:
LOG_DEBUG("Assigned IP address to client\n");
LOG_INFO("Assigned IP address to client\n");
break;
case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED:
LOG_DEBUG("Received probe request\n");
LOG_INFO("Received probe request\n");
break;
case ARDUINO_EVENT_WIFI_AP_GOT_IP6:
LOG_DEBUG("IPv6 is preferred\n");
LOG_INFO("IPv6 is preferred\n");
break;
case ARDUINO_EVENT_WIFI_FTM_REPORT:
LOG_DEBUG("Fast Transition Management report\n");
LOG_INFO("Fast Transition Management report\n");
break;
case ARDUINO_EVENT_ETH_START:
LOG_DEBUG("Ethernet started\n");
LOG_INFO("Ethernet started\n");
break;
case ARDUINO_EVENT_ETH_STOP:
LOG_DEBUG("Ethernet stopped\n");
LOG_INFO("Ethernet stopped\n");
break;
case ARDUINO_EVENT_ETH_CONNECTED:
LOG_DEBUG("Ethernet connected\n");
LOG_INFO("Ethernet connected\n");
break;
case ARDUINO_EVENT_ETH_DISCONNECTED:
LOG_DEBUG("Ethernet disconnected\n");
LOG_INFO("Ethernet disconnected\n");
break;
case ARDUINO_EVENT_ETH_GOT_IP:
LOG_DEBUG("Obtained IP address (ARDUINO_EVENT_ETH_GOT_IP)\n");
LOG_INFO("Obtained IP address (ARDUINO_EVENT_ETH_GOT_IP)\n");
break;
case ARDUINO_EVENT_ETH_GOT_IP6:
LOG_DEBUG("Obtained IP6 address (ARDUINO_EVENT_ETH_GOT_IP6)\n");
LOG_INFO("Obtained IP6 address (ARDUINO_EVENT_ETH_GOT_IP6)\n");
break;
case ARDUINO_EVENT_SC_SCAN_DONE:
LOG_DEBUG("SmartConfig: Scan done\n");
LOG_INFO("SmartConfig: Scan done\n");
break;
case ARDUINO_EVENT_SC_FOUND_CHANNEL:
LOG_DEBUG("SmartConfig: Found channel\n");
LOG_INFO("SmartConfig: Found channel\n");
break;
case ARDUINO_EVENT_SC_GOT_SSID_PSWD:
LOG_DEBUG("SmartConfig: Got SSID and password\n");
LOG_INFO("SmartConfig: Got SSID and password\n");
break;
case ARDUINO_EVENT_SC_SEND_ACK_DONE:
LOG_DEBUG("SmartConfig: Send ACK done\n");
LOG_INFO("SmartConfig: Send ACK done\n");
break;
case ARDUINO_EVENT_PROV_INIT:
LOG_DEBUG("Provisioning: Init\n");
LOG_INFO("Provisioning: Init\n");
break;
case ARDUINO_EVENT_PROV_DEINIT:
LOG_DEBUG("Provisioning: Stopped\n");
LOG_INFO("Provisioning: Stopped\n");
break;
case ARDUINO_EVENT_PROV_START:
LOG_DEBUG("Provisioning: Started\n");
LOG_INFO("Provisioning: Started\n");
break;
case ARDUINO_EVENT_PROV_END:
LOG_DEBUG("Provisioning: End\n");
LOG_INFO("Provisioning: End\n");
break;
case ARDUINO_EVENT_PROV_CRED_RECV:
LOG_DEBUG("Provisioning: Credentials received\n");
LOG_INFO("Provisioning: Credentials received\n");
break;
case ARDUINO_EVENT_PROV_CRED_FAIL:
LOG_DEBUG("Provisioning: Credentials failed\n");
LOG_INFO("Provisioning: Credentials failed\n");
break;
case ARDUINO_EVENT_PROV_CRED_SUCCESS:
LOG_DEBUG("Provisioning: Credentials success\n");
LOG_INFO("Provisioning: Credentials success\n");
break;
default:
break;