commit d793606f2d46f5020669ecf24af2f4a3bb446b30
author Richard Barnette <jrbarnette@chromium.org> Fri Jan 18 13:38:51 2013 -0800
committer ChromeBot <chrome-bot@google.com> Fri Jan 18 18:28:58 2013 -0800
tree 4ce9d6da9a3be8556e621fa3ae8b39d1fe494548
parent 5e73ad739d514a1186a1fbbbc28e3de33dade9cf

Change how update_engine_client handles DBus proxy failures.

Change GetProxy() to log failures with LOG(ERROR) and then
terminate, rather than use LOG(FATAL), as the latter unhelpfully
generates a core file.

BUG=chromium-os:37542
TEST=run update_engine_client with and without a working update_engine

Change-Id: Id84b56ff0b5ffa51cf4fda4cb7ad847f5bb617e5
Reviewed-on: https://gerrit.chromium.org/gerrit/41662
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>

update_engine_client.cc

diff --git a/update_engine_client.cc b/update_engine_client.cc
index 9d5767c..1f3dc34 100644
--- a/update_engine_client.cc
+++ b/update_engine_client.cc
@@ -45,7 +45,10 @@
   const int kRetrySeconds = 10;
 
   bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-  LOG_IF(FATAL, !bus) << "Failed to get bus: " << GetAndFreeGError(&error);
+  if (bus == NULL) {
+    LOG(ERROR) << "Failed to get bus: " << GetAndFreeGError(&error);
+    exit(1);
+  }
   for (int i = 0; !proxy && i < kTries; ++i) {
     if (i > 0) {
       LOG(INFO) << "Retrying to get dbus proxy. Try "
@@ -61,8 +64,11 @@
                             << kUpdateEngineServiceName << ": "
                             << GetAndFreeGError(&error);
   }
-  LOG_IF(FATAL, !proxy) << "Giving up -- unable to get dbus proxy for "
-                        << kUpdateEngineServiceName;
+  if (proxy == NULL) {
+    LOG(ERROR) << "Giving up -- unable to get dbus proxy for "
+               << kUpdateEngineServiceName;
+    exit(1);
+  }
   *out_proxy = proxy;
   return true;
 }