log eklendi

Author: mgulacti

libs/platform/get_text_by_id.cpp

@@ -98,25 +98,39 @@ bool GetJsonBuffer(platform::TextSource textSource, string const & localeName, s
     catch (base::Json::Exception const & exJson)
     {
       // Prepare hex sample for logs
-      std::ostringstream oss;
-      size_t sampleLen = std::min<size_t>(jsonBuffer.size(), 128);
-      for (size_t i = 0; i < sampleLen; ++i)
+      std::ostringstream oss_head, oss_tail;
+      size_t jsonSize = jsonBuffer.size();
+      size_t head_len = std::min<size_t>(jsonSize, 128);
+      for (size_t i = 0; i < head_len; ++i)
       {
-        oss << std::hex << std::setfill('0') << std::setw(2)
-            << (static_cast<unsigned int>(static_cast<unsigned char>(jsonBuffer[i]))) << ' ';
+        oss_head << std::hex << std::setfill('0') << std::setw(2)
+                 << (static_cast<unsigned int>(static_cast<unsigned char>(jsonBuffer[i]))) << ' ';
       }
-  // Log as WARNING first so we can attempt a non-fatal fallback before
-  // escalating to an error that triggers the abort behavior in some
-  // Android builds.
-  //LOG(LWARNING, ("JSON parse error for locale:", localeName, "file:", relPath, "error:", exJson.what(), "sample_bytes:", oss.str()));
+
+      if (jsonSize > 128)
+      {
+        size_t tail_start = jsonSize > 128 ? jsonSize - 128 : 0;
+        for (size_t i = tail_start; i < jsonSize; ++i)
+        {
+          oss_tail << std::hex << std::setfill('0') << std::setw(2)
+                   << (static_cast<unsigned int>(static_cast<unsigned char>(jsonBuffer[i]))) << ' ';
+        }
+      }
+
+      std::ostringstream log_msg;
+      log_msg << "JSON parse error for locale: " << localeName
+              << " file: " << relPath
+              << " error: " << exJson.what()
+              << " head_bytes: " << oss_head.str()
+              << " tail_bytes: " << oss_tail.str();
+      LOG(LWARNING, (log_msg.str()));
 
       // Mitigation: try interpreting the bytes as ISO-8859-1 (Latin1) and
       // convert to UTF-8, then attempt parsing again. If conversion+
       // parse succeeds we keep the converted buffer and proceed; otherwise
       // preserve original behavior and rethrow to trigger fallback logic.
       try
       {
-  //LOG(LINFO, ("Attempting Latin1->UTF8 fallback for:", relPath));
         string converted = Latin1ToUtf8(jsonBuffer);
         // Try parsing converted buffer
         try
@@ -133,13 +147,24 @@ bool GetJsonBuffer(platform::TextSource textSource, string const & localeName, s
           // Fallback parsing failed — log as WARNING so we can try higher-
           // level fallback (embedded default) instead of aborting the
           // process on platforms where ERROR logs trigger aborts.
-          //LOG(LWARNING, ("Latin1->UTF8 fallback parse failed for:", relPath,"original_error:", exJson.what(), "fallback_error:", ex2.what(), "sample_bytes:", oss.str()));
+          std::ostringstream log_msg;
+          log_msg << "Latin1->UTF8 fallback parse failed for: " << relPath
+                  << " original_error: " << exJson.what()
+                  << " fallback_error: " << ex2.what()
+                  << " head_bytes: " << oss_head.str()
+                  << " tail_bytes: " << oss_tail.str();
+          LOG(LWARNING, (log_msg.str()));
           MYTHROW(RootException, ("Invalid JSON in file", relPath, exJson.what()));
         }
       }
       catch (std::exception const & e)
       {
-        LOG(LWARNING, ("Latin1->UTF8 fallback failed with exception:", e.what(), "file:", relPath));
+        std::ostringstream log_msg;
+        log_msg << "Latin1->UTF8 fallback failed with exception: " << e.what()
+                << " file: " << relPath
+                << " head_bytes: " << oss_head.str()
+                << " tail_bytes: " << oss_tail.str();
+        LOG(LWARNING, (log_msg.str()));
         MYTHROW(RootException, ("Invalid JSON in file", relPath, exJson.what()));
       }
     }