Add GetLog method call to DebugDaemonClient

chromeos/dbus/debug_daemon_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/debug_daemon_client.h"
 
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
@@ skipping 263 matching lines @@
     dbus::MethodCall method_call(debugd::kDebugdInterface,
                                  debugd::kGetUserLogFiles);
     debugdaemon_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&DebugDaemonClientImpl::OnGetUserLogFiles,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
   }
 
+  void GetLog(const std::string& log_name,
+              const GetLogsCallback& callback) override {
+    dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetLog);
+    dbus::MessageWriter(&method_call).AppendString(log_name);
+    debugdaemon_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&DebugDaemonClientImpl::OnGetLog,
+                   weak_ptr_factory_.GetWeakPtr(), log_name, callback));
+  }
+
   // base::trace_event::TracingAgent implementation.
   std::string GetTracingAgentName() override { return kCrOSTracingAgentName; }
 
   std::string GetTraceEventLabel() override { return kCrOSTraceLabel; }
 
   void StartAgentTracing(const base::trace_event::TraceConfig& trace_config,
                          const StartAgentTracingCallback& callback) override {
     dbus::MethodCall method_call(
         debugd::kDebugdInterface,
         debugd::kSystraceStart);
@@ skipping 328 matching lines @@
       logs[key] = value;
     }
     callback.Run(!sub_reader.HasMoreData() && !broken, logs);
   }
 
   void OnGetUserLogFiles(const GetLogsCallback& callback,
                          dbus::Response* response) {
     return OnGetAllLogs(callback, response);
   }
 
+  void OnGetLog(const std::string& log_name,
+                const GetLogsCallback& callback,
+                dbus::Response* response) {
+    std::map<std::string, std::string> result;
+    std::string result_string;
+    if (!response || !dbus::MessageReader(response).PopString(&result_string)) {
+      callback.Run(false, result);
+      return;
+    }
+    result[log_name] = result_string;

[Daniel Erat, 2017/06/23 01:04:27]

returning a single-entry map feels a bit hacky. would it make sense to add a new
GetLogCallback typedef that just receives a string?

[Simon Que, 2017/06/23 01:15:10]

Done.

+    callback.Run(true, result);
+  }
+
   void OnBigFeedbackLogsResponse(base::WeakPtr<PipeReaderWrapper> pipe_reader,
                                  dbus::Response* response) {
     if (!response && pipe_reader.get()) {
       // We need to terminate the data stream if an error occurred while the
       // pipe reader is still waiting on read.
       pipe_reader->TerminateStream();
     }
   }
 
   // Called when a response for a simple start is received.
@@ skipping 133 matching lines @@
 DebugDaemonClient::EmptyStopAgentTracingCallback() {
   return base::Bind(&EmptyStopAgentTracingCallbackBody);
 }
 
 // static
 DebugDaemonClient* DebugDaemonClient::Create() {
   return new DebugDaemonClientImpl();
 }
 
 }  // namespace chromeos