commit c14801d0aaceefb0f67227c6ab7826061141fa12
author Jae Hoon Kim <kimjae@chromium.org> Tue Sep 03 13:13:59 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Sep 10 00:56:06 2019 +0000
tree ed1d41e4794b66aa0f26cdff866874754ab71ba5
parent a1f4a7dcaa921fcb0ab395214a9558a62ca083f2

update_engine: Printf's should leverage KeyValueStore printouts

Since new values may be added and removed from the printouts to the
calls of update_engine-client, the use of KeyValueStore to standardize
the printouts will allow for future changes without messing up the
string literal to printf.

BUG=none
TEST=FEATURES="test" emerge-$BOARD update_engine update_engine-client
TEST=test_that -b $BOARD $IP autoupdate_EOL

Change-Id: I55d69a0533da2312c56d455bf6ad3f4af845c2c2
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1783594
Tested-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

update_engine_client.cc

diff --git a/update_engine_client.cc b/update_engine_client.cc
index 954e856..d78cee7 100644
--- a/update_engine_client.cc
+++ b/update_engine_client.cc
@@ -26,10 +26,12 @@
 #include <base/command_line.h>
 #include <base/logging.h>
 #include <base/macros.h>
+#include <base/strings/string_number_conversions.h>
 #include <base/strings/string_split.h>
 #include <base/threading/platform_thread.h>
 #include <brillo/daemons/daemon.h>
 #include <brillo/flag_helper.h>
+#include <brillo/key_value_store.h>
 
 #include "update_engine/client.h"
 #include "update_engine/common/error_code.h"
@@ -39,6 +41,7 @@
 #include "update_engine/update_status.h"
 #include "update_engine/update_status_utils.h"
 
+using brillo::KeyValueStore;
 using chromeos_update_engine::EolStatus;
 using chromeos_update_engine::ErrorCode;
 using chromeos_update_engine::UpdateEngineStatusToString;
@@ -550,11 +553,18 @@
       LOG(ERROR) << "Error getting last attempt error.";
     } else {
       ErrorCode code = static_cast<ErrorCode>(last_attempt_error);
-      printf(
-          "ERROR_CODE=%i\n"
-          "ERROR_MESSAGE=%s\n",
-          last_attempt_error,
-          ErrorCodeToString(code).c_str());
+
+      KeyValueStore last_attempt_error_store;
+#if BASE_VER < 576279
+      last_attempt_error_store.SetString(
+          "ERROR_CODE", base::Int64ToString(last_attempt_error));
+#else
+      last_attempt_error_store.SetString(
+          "ERROR_CODE", base::NumberToString(last_attempt_error));
+#endif
+      last_attempt_error_store.SetString("ERROR_MESSAGE",
+                                         ErrorCodeToString(code));
+      printf("%s", last_attempt_error_store.SaveToString().c_str());
     }
   }
 
@@ -564,7 +574,12 @@
       LOG(ERROR) << "Error getting the end-of-life status.";
     } else {
       EolStatus eol_status_code = static_cast<EolStatus>(eol_status);
-      printf("EOL_STATUS=%s\n", EolStatusToString(eol_status_code));
+
+      KeyValueStore eol_status_store;
+      eol_status_store.SetString("EOL_STATUS",
+                                 EolStatusToString(eol_status_code));
+
+      printf("%s", eol_status_store.SaveToString().c_str());
     }
   }