[Log] Fix freeing memory in the log struct.

Author: TD-er

src/src/DataStructs/LogStruct.cpp

@@ -94,7 +94,6 @@ void LogStruct::clearExpiredEntries() {
   while (maxLoops > 0) {
     --maxLoops;
     if (isEmpty() ||  // Nothing left
-        timeStamp[read_idx] == 0 || // Already reset entry
         (timePassedSince(timeStamp[read_idx]) < LOG_BUFFER_EXPIRE)) // Expired
     {
       return;
@@ -106,7 +105,7 @@ void LogStruct::clearExpiredEntries() {
 void LogStruct::clearOldest() {
   if (!isEmpty()) {
     is_full = false;
-    Message[read_idx].clear();
+    Message[read_idx] = String();
     timeStamp[read_idx] = 0;
     log_level[read_idx] = 0;
     read_idx  = nextIndex(read_idx);

src/src/ESPEasyCore/ESPEasyRules.cpp

@@ -1468,10 +1468,10 @@ void createRuleEvents(struct EventStruct *event) {
       addLog(LOG_LEVEL_ERROR, F("Not enough memory for event"));
       return;
     }
-    eventString  = getTaskDeviceName(event->TaskIndex);
-    eventString += F("#");
+    eventString += getTaskDeviceName(event->TaskIndex);
+    eventString += '#';
     eventString += ExtraTaskSettings.TaskDeviceValueNames[0];
-    eventString += F("=");
+    eventString += '=';
     eventString += '`';
     if (appendCompleteStringvalue) {
       eventString += event->String2;
@@ -1485,7 +1485,7 @@ void createRuleEvents(struct EventStruct *event) {
   } else if (Settings.CombineTaskValues_SingleEvent(event->TaskIndex)) {
     String eventString;
     eventString.reserve(128); // Enough for most use cases, prevent lots of memory allocations.
-    eventString  = getTaskDeviceName(event->TaskIndex);
+    eventString += getTaskDeviceName(event->TaskIndex);
     eventString += F("#All=");
 
     for (uint8_t varNr = 0; varNr < valueCount; varNr++) {
@@ -1499,10 +1499,10 @@ void createRuleEvents(struct EventStruct *event) {
     for (uint8_t varNr = 0; varNr < valueCount; varNr++) {
       String eventString;
       eventString.reserve(64); // Enough for most use cases, prevent lots of memory allocations.
-      eventString  = getTaskDeviceName(event->TaskIndex);
-      eventString += F("#");
+      eventString += getTaskDeviceName(event->TaskIndex);
+      eventString += '#';
       eventString += ExtraTaskSettings.TaskDeviceValueNames[varNr];
-      eventString += F("=");
+      eventString += '=';
       eventString += formatUserVarNoCheck(event, varNr);
       eventQueue.addMove(std::move(eventString));
     }

src/src/WebServer/WebServer.cpp

@@ -348,11 +348,6 @@ void setWebserverRunning(bool state) {
 
 void getWebPageTemplateDefault(const String& tmplName, WebTemplateParser& parser)
 {
-  #ifdef USE_SECOND_HEAP
-  // Store template in 2nd heap
-  HeapSelectIram ephemeral;
-  #endif
-
   const bool addJS   = true;
   const bool addMeta = true;