ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-18 01:11:42 +10:00
Code Releases Activity

Log levels refactoring

Browse Source
This commit is contained in:
Ben Meadors
2022-12-29 20:41:37 -06:00
parent 979d12d607
commit 0b5cae5393
90 changed files with 1053 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesh/http/WebServer.cpp
+19 -19
View File
@@ -68,19 +68,19 @@ static void taskCreateCert(void *parameter)
#if 0
// Delete the saved certs (used in debugging)
DEBUG_MSG("Deleting any saved SSL keys ...\n");
LOG_DEBUG("Deleting any saved SSL keys ...\n");
// prefs.clear();
prefs.remove("PK");
prefs.remove("cert");
#endif
DEBUG_MSG("Checking if we have a previously saved SSL Certificate.\n");
LOG_DEBUG("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) {
DEBUG_MSG("Existing SSL Certificate found!\n");
LOG_DEBUG("Existing SSL Certificate found!\n");
uint8_t *pkBuffer = new uint8_t[pkLen];
prefs.getBytes("PK", pkBuffer, pkLen);
@@ -90,12 +90,12 @@ static void taskCreateCert(void *parameter)
cert = new SSLCert(certBuffer, certLen, pkBuffer, pkLen);
DEBUG_MSG("Retrieved Private Key: %d Bytes\n", cert->getPKLength());
DEBUG_MSG("Retrieved Certificate: %d Bytes\n", cert->getCertLength());
LOG_DEBUG("Retrieved Private Key: %d Bytes\n", cert->getPKLength());
LOG_DEBUG("Retrieved Certificate: %d Bytes\n", cert->getCertLength());
} else {
DEBUG_MSG("Creating the certificate. This may take a while. Please wait...\n");
LOG_DEBUG("Creating the certificate. This may take a while. Please wait...\n");
yield();
cert = new SSLCert();
yield();
@@ -104,14 +104,14 @@ static void taskCreateCert(void *parameter)
yield();
if (createCertResult != 0) {
DEBUG_MSG("Creating the certificate failed\n");
LOG_DEBUG("Creating the certificate failed\n");
} else {
DEBUG_MSG("Creating the certificate was successful\n");
LOG_DEBUG("Creating the certificate was successful\n");
DEBUG_MSG("Created Private Key: %d Bytes\n", cert->getPKLength());
LOG_DEBUG("Created Private Key: %d Bytes\n", cert->getPKLength());
DEBUG_MSG("Created Certificate: %d Bytes\n", cert->getCertLength());
LOG_DEBUG("Created Certificate: %d Bytes\n", cert->getCertLength());
prefs.putBytes("PK", (uint8_t *)cert->getPKData(), cert->getPKLength());
prefs.putBytes("cert", (uint8_t *)cert->getCertData(), cert->getCertLength());
@@ -140,11 +140,11 @@ void createSSLCert()
16, /* Priority of the task. */
NULL); /* Task handle. */
DEBUG_MSG("Waiting for SSL Cert to be generated.\n");
LOG_DEBUG("Waiting for SSL Cert to be generated.\n");
while (!isCertReady) {
if ((millis() / 500) % 2) {
if (runLoop) {
DEBUG_MSG(".");
LOG_DEBUG(".");
yield();
esp_task_wdt_reset();
@@ -159,7 +159,7 @@ void createSSLCert()
runLoop = true;
}
}
DEBUG_MSG("SSL Cert Ready!\n");
LOG_DEBUG("SSL Cert Ready!\n");
}
}
@@ -169,7 +169,7 @@ WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {}
int32_t WebServerThread::runOnce()
{
// DEBUG_MSG("WebServerThread::runOnce()\n");
// LOG_DEBUG("WebServerThread::runOnce()\n");
handleWebResponse();
if (requestRestart && (millis() / 1000) > requestRestart) {
@@ -182,7 +182,7 @@ int32_t WebServerThread::runOnce()
void initWebServer()
{
DEBUG_MSG("Initializing Web Server ...\n");
LOG_DEBUG("Initializing Web Server ...\n");
// We can now use the new certificate to setup our server as usual.
secureServer = new HTTPSServer(cert);
@@ -191,15 +191,15 @@ void initWebServer()
registerHandlers(insecureServer, secureServer);
if (secureServer) {
DEBUG_MSG("Starting Secure Web Server...\n");
LOG_DEBUG("Starting Secure Web Server...\n");
secureServer->start();
}
DEBUG_MSG("Starting Insecure Web Server...\n");
LOG_DEBUG("Starting Insecure Web Server...\n");
insecureServer->start();
if (insecureServer->isRunning()) {
DEBUG_MSG("Web Servers Ready! :-) \n");
LOG_DEBUG("Web Servers Ready! :-) \n");
isWebServerReady = true;
} else {
DEBUG_MSG("Web Servers Failed! ;-( \n");
LOG_DEBUG("Web Servers Failed! ;-( \n");
}
}