commit 7d1d0c2173c27072dcaec8ef31e228ba662cc7a6
author Thomas Köppe <tkoeppe@google.com> Fri May 26 08:29:54 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Fri May 26 08:31:27 2023 -0700
tree bfbc990bb2f12c274a7e9b5fe2e16aba81fa8817
parent 2a923f1c1a5319b54ed2144dea22814c22dad46b

Fix server messages emitted when a signal causes cancellation of the current operation to not say "shutting down", but instead "cancelling pending operation". It is confusing and misleading to claim that the server is being shut down when that is not in fact happening. Shutting down the server is a much more serious result, and users would benefit from clearly understanding the distinction.

See also https://bazel.build/advanced/performance/iteration-speed.

PiperOrigin-RevId: 535625080
Change-Id: Ia42dd580a80c37e92d10f7422402ff3316e5b09d

src/main/cpp/blaze_util_posix.cc

diff --git a/src/main/cpp/blaze_util_posix.cc b/src/main/cpp/blaze_util_posix.cc
index b8c3005..76bcbff 100644
--- a/src/main/cpp/blaze_util_posix.cc
+++ b/src/main/cpp/blaze_util_posix.cc
@@ -140,7 +140,7 @@
     case SIGINT:
       if (++sigint_count >= 3) {
         SigPrintf(
-            "\n%s caught third interrupt signal; killed.\n\n",
+            "\n%s caught third interrupt signal; server killed.\n\n",
             SignalHandler::Get().GetProductName().c_str());
         if (SignalHandler::Get().GetServerProcessInfo()->server_pid_ != -1) {
           KillServerProcess(
@@ -150,13 +150,13 @@
         _exit(1);
       }
       SigPrintf(
-          "\n%s caught interrupt signal; shutting down.\n\n",
+          "\n%s caught interrupt signal; cancelling pending invocation.\n\n",
           SignalHandler::Get().GetProductName().c_str());
       SignalHandler::Get().CancelServer();
       break;
     case SIGTERM:
       SigPrintf(
-          "\n%s caught terminate signal; shutting down.\n\n",
+          "\n%s caught terminate signal; cancelling pending invocation.\n\n",
           SignalHandler::Get().GetProductName().c_str());
       SignalHandler::Get().CancelServer();
       break;