commit e1e61f9f382fd95a23b2f40f52852f10152fd8a3
author Calder Kitagawa <ckitagawa@google.com> Thu Jan 11 20:16:57 2018
committer Commit Bot <commit-bot@chromium.org> Thu Jan 11 20:16:57 2018
tree 8273f992273f4fe8418de4aadc0cdbd8e887b79e
parent 85942b1302c815b480b0a139ab66d72dac61d0da

[Courgette]: Added "-nologfile" switch to disable logging to file.

This is a very simple fix if "-nologfile" is present in the command
line args the log file is not created. The logs are still recorded to
stdout.

Bug: 801274
Change-Id: Iea027ced63b4c0f276859a22ba8adfa3d2579d39
Reviewed-on: https://chromium-review.googlesource.com/862244
Commit-Queue: Calder Kitagawa <ckitagawa@google.com>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#528729}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4acd08fa3248e35509ae7e4897d5aab69e2e109d

courgette_tool.cc

diff --git a/courgette_tool.cc b/courgette_tool.cc
index 7079811..a8e2920 100644
--- a/courgette_tool.cc
+++ b/courgette_tool.cc
@@ -97,12 +97,11 @@
 
 /******** Various helpers ********/
 
-void WriteSinkToFile(const courgette::SinkStream *sink,
+void WriteSinkToFile(const courgette::SinkStream* sink,
                      const base::FilePath& output_file) {
-  int count =
-      base::WriteFile(output_file,
-                           reinterpret_cast<const char*>(sink->Buffer()),
-                           static_cast<int>(sink->Length()));
+  int count = base::WriteFile(output_file,
+                              reinterpret_cast<const char*>(sink->Buffer()),
+                              static_cast<int>(sink->Length()));
   if (count == -1)
     Problem("Can't write output.");
   if (static_cast<size_t>(count) != sink->Length())
@@ -244,7 +243,7 @@
     Problem(flow.message().c_str());
 
   courgette::SinkStream empty_sink;
-  for (int i = 0;  ; ++i) {
+  for (int i = 0;; ++i) {
     courgette::SinkStream* old_stream = flow.data(flow.OLD)->sinks.stream(i);
     courgette::SinkStream* new_stream = flow.data(flow.NEW)->sinks.stream(i);
     if (old_stream == NULL && new_stream == NULL)
@@ -309,10 +308,9 @@
   // entry point as the installer.  That entry point point takes file names and
   // returns an status code but does not output any diagnostics.
 
-  courgette::Status status =
-      courgette::ApplyEnsemblePatch(old_file.value().c_str(),
-                                    patch_file.value().c_str(),
-                                    new_file.value().c_str());
+  courgette::Status status = courgette::ApplyEnsemblePatch(
+      old_file.value().c_str(), patch_file.value().c_str(),
+      new_file.value().c_str());
 
   if (status == courgette::C_OK)
     return;
@@ -407,8 +405,12 @@
       *base::CommandLine::ForCurrentProcess();
 
   logging::LoggingSettings settings;
-  settings.logging_dest = logging::LOG_TO_ALL;
-  settings.log_file = FILE_PATH_LITERAL("courgette.log");
+  if (command_line.HasSwitch("nologfile")) {
+    settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+  } else {
+    settings.logging_dest = logging::LOG_TO_ALL;
+    settings.log_file = FILE_PATH_LITERAL("courgette.log");
+  }
   (void)logging::InitLogging(settings);
   logging::SetMinLogLevel(logging::LOG_VERBOSE);