Cleanup code structure.

Remove duplicate printout "Found 1 Solr nodes:"
apache · Oct 18, 2024 · 0d0ee43 · 0d0ee43
1 parent 9835f06
commit 0d0ee43
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 37 deletions.
diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -138,46 +138,34 @@ public void runImpl(CommandLine cli) throws Exception {
         System.exit(1);
       } else {
         solrUrl = proc.get().getLocalUrl();
+        if (shortFormat) {
+          CLIO.out(solrUrl);
+        } else {
+          printProcessStatus(proc.get(), cli);
+        }
+        System.exit(0);
       }
     }
 
-    if (solrUrl == null) {
-      if (!shortFormat) {
-        CLIO.out("Looking for running processes...");
-      }
-      Collection<SolrProcess> procs = processMgr.scanSolrPidFiles();
-      if (!shortFormat) {
-        CLIO.out(String.format(Locale.ROOT, "\nFound %s Solr nodes: ", procs.size()));
-      }
-      if (!procs.isEmpty()) {
-        for (SolrProcess process : procs) {
-          if (shortFormat) {
-            CLIO.out(process.getLocalUrl());
-          } else {
-            printProcessStatus(process, cli);
-          }
-        }
-      } else {
-        if (!shortFormat) {
-          CLIO.out("\nNo Solr nodes are running.\n");
+    // No URL or port, scan for running processes
+    if (!shortFormat) {
+      CLIO.out("Looking for running processes...");
+    }
+    Collection<SolrProcess> procs = processMgr.scanSolrPidFiles();
+    if (!shortFormat) {
+      CLIO.out(String.format(Locale.ROOT, "\nFound %s Solr nodes: ", procs.size()));
+    }
+    if (!procs.isEmpty()) {
+      for (SolrProcess process : procs) {
+        if (shortFormat) {
+          CLIO.out(process.getLocalUrl());
+        } else {
+          printProcessStatus(process, cli);
         }
       }
     } else {
-      // We have a solrUrl
-      int urlPort = portFromUrl(solrUrl);
-      if (shortFormat) {
-        if (processMgr.isRunningWithPort(urlPort)) {
-          CLIO.out(solrUrl);
-        }
-      } else {
-        Optional<SolrProcess> process = processMgr.processForPort(urlPort);
-
-        if (process.isPresent()) {
-          CLIO.out(String.format(Locale.ROOT, "\nFound %s Solr nodes: ", 1));
-          printProcessStatus(process.get(), cli);
-        } else {
-          CLIO.out("\nNo Solr running on port " + urlPort + ".");
-        }
+      if (!shortFormat) {
+        CLIO.out("\nNo Solr nodes are running.\n");
       }
     }
   }
@@ -262,7 +250,6 @@ public boolean printStatusFromRunningSolr(String solrUrl, CommandLine cli) throw
       /* ignore */
     }
     if (statusJson != null) {
-      CLIO.out("Found 1 Solr nodes:");
       CLIO.out(statusJson);
     } else {
       CLIO.err("Solr at " + solrUrl + " not online.");

diff --git a/solr/packaging/test/test_status.bats b/solr/packaging/test/test_status.bats
@@ -42,15 +42,13 @@ teardown() {
 @test "status with --solr-url from user" {
   solr start
   run solr status --solr-url http://localhost:${SOLR_PORT}
-  assert_output --partial "Found 1 Solr nodes:"
   assert_output --partial "\"solr_home\":"
   solr stop
 }
 
 @test "status with --port from user" {
   solr start
   run solr status --port ${SOLR_PORT}
-  assert_output --partial "Found 1 Solr nodes:"
   assert_output --partial "running on port ${SOLR_PORT}"
   solr stop
 }