Logging for RestartJob.

chromeos/dbus/session_manager_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/session_manager_client.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/socket.h>
 
@@ skipping 65 matching lines @@
     return;
   }
 
   local_auth_fd->PutValue(sockets[0]);
   local_auth_fd->CheckValidity();
 
   remote_auth_fd->PutValue(sockets[1]);
   remote_auth_fd->CheckValidity();
 }
 
+void HandleDBusError(dbus::ErrorResponse* response) {
+  PLOG(ERROR) << "DBus error " << response->ToString();

[Daniel Erat, 2016/08/25 02:13:19]

LOG(ERROR) is the right thing to use here. PLOG is only appropriate when a posix
call (read(), write(), fork(), exec(), etc.) failed immediately before and you
want to include the reason why. you don't know what the d-bus library called
immediately prior to handing you the error (and in this particular case, it
probably did a successful read() of the error message from a socket or something
similar to that, so PLOG would actually log "Success").

[achuithb, 2016/08/25 21:10:02]

Done.

Thanks for the explanation.

+}
+
 }  // namespace
 
 // The SessionManagerClient implementation used in production.
 class SessionManagerClientImpl : public SessionManagerClient {
  public:
   SessionManagerClientImpl()
       : session_manager_proxy_(NULL),
         screen_is_locked_(false),
         weak_ptr_factory_(this) {}
 
@@ skipping 395 matching lines @@
             callback));
   }
 
   // Calls RestartJob to tell the session manager to restart the browser using
   // the contents of |argv| as the command line, authorizing the call using
   // credentials acquired via |remote_auth_fd|. Ownership of |local_auth_fd| is
   // held for the duration of the dbus call.
   void CallRestartJobWithValidFd(dbus::ScopedFileDescriptor local_auth_fd,
                                  dbus::ScopedFileDescriptor remote_auth_fd,
                                  const std::vector<std::string>& argv) {
+    VLOG(1) << "CallRestartJobWithValidFd";
     dbus::MethodCall method_call(login_manager::kSessionManagerInterface,
                                  login_manager::kSessionManagerRestartJob);
     dbus::MessageWriter writer(&method_call);
     writer.AppendFileDescriptor(*remote_auth_fd);
     writer.AppendArrayOfStrings(argv);
 
     // Ownership of local_auth_fd is passed to the callback that is to be
     // called on completion of this method call. This keeps the browser end
     // of the socket-pair alive for the duration of the RPC.
-    session_manager_proxy_->CallMethod(
+    session_manager_proxy_->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&SessionManagerClientImpl::OnRestartJob,
                    weak_ptr_factory_.GetWeakPtr(),
-                   base::Passed(&local_auth_fd)));
+                   base::Passed(&local_auth_fd)),
+        base::Bind(HandleDBusError));
   }
 
   // Called when kSessionManagerRestartJob method is complete.
   // Now that the call is complete, local_auth_fd can be closed and discarded,
   // which will happen automatically when it goes out of scope.
   void OnRestartJob(dbus::ScopedFileDescriptor local_auth_fd,
                     dbus::Response* response) {
     LOG_IF(ERROR, !response)
         << "Failed to call "
         << login_manager::kSessionManagerRestartJob;

[Daniel Erat, 2016/08/25 02:13:19]

do you also want to add temporary logging on success here?

[achuithb, 2016/08/25 21:10:02]

Done.

   }
 
   // Called when kSessionManagerStartSession method is complete.
   void OnStartSession(dbus::Response* response) {
     LOG_IF(ERROR, !response)
         << "Failed to call "
         << login_manager::kSessionManagerStartSession;
   }
 
   // Called when kSessionManagerStopSession method is complete.
@@ skipping 436 matching lines @@
 
 SessionManagerClient* SessionManagerClient::Create(
     DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new SessionManagerClientImpl();
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new SessionManagerClientStubImpl();
 }
 
 }  // namespace chromeos