(jena) branch main updated: GH-2902: Adjust log messages

[andy]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 00b22336f7 GH-2902: Adjust log messages
00b22336f7 is described below

commit 00b22336f77b164a969ff98356638261d73c24c0
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Jan 14 11:55:38 2025 +0000

    GH-2902: Adjust log messages
---
 jena-cmds/src/main/java/org/apache/jena/cmd/CmdMain.java             | 3 +--
 .../src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java   | 5 ++---
 .../src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java | 3 +--
 .../src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java         | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/jena-cmds/src/main/java/org/apache/jena/cmd/CmdMain.java 
b/jena-cmds/src/main/java/org/apache/jena/cmd/CmdMain.java
index 9319e8b1e5..8425b8578d 100644
--- a/jena-cmds/src/main/java/org/apache/jena/cmd/CmdMain.java
+++ b/jena-cmds/src/main/java/org/apache/jena/cmd/CmdMain.java
@@ -51,8 +51,7 @@ public abstract class CmdMain extends CmdLineArgs
     { mainRun(true, true); }
 
     /** Run command */
-    public int mainRun(boolean exitOnSuccess, boolean exitOnFailure)
-    {
+    public int mainRun(boolean exitOnSuccess, boolean exitOnFailure) {
         try { mainMethod(); }
         catch (TerminationException ex) { System.exit(ex.getCode()); }
         catch (IllegalArgumentException ex)
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
index be5a6314a8..8eb126c5cf 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
@@ -250,7 +250,7 @@ public class FusekiMain extends CmdARQ {
 
     private void argumentsSetup() {
         modVersion.addClass("Fuseki", Fuseki.class);
-        
+
         getUsage().startCategory("Fuseki");
         add(argConfig, "--config=FILE",
             "Use a configuration file to determine the services");
@@ -638,8 +638,6 @@ public class FusekiMain extends CmdARQ {
 
     private FusekiServer execMakeServer() {
         try {
-            FusekiCoreInfo.logCode(Fuseki.serverLog);
-            // Arguments have been processed to produce serverArgs in 
processModulesAndArgs()
             return makeServer(serverArgs);
         } catch (AssemblerException | FusekiException  ex) {
             if ( ex.getCause() != null )
@@ -650,6 +648,7 @@ public class FusekiMain extends CmdARQ {
         }
     }
 
+    /** The method is blocking. */
     private void execStartServer(FusekiServer server) {
         infoCmd(server, Fuseki.serverLog);
         try {
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java
index e86532594b..e6443a2def 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java
@@ -48,7 +48,7 @@ public class FusekiServerRunner {
     public static FusekiServer runAsync(String... args) {
         FusekiServer server = construct(args);
         try {
-            server.start();
+            return server.start();
         } catch (FusekiException ex) {
             if ( ex.getCause() instanceof BindException ) {
 //                if ( serverArgs.jettyConfigFile == null )
@@ -62,7 +62,6 @@ public class FusekiServerRunner {
         } catch (Exception ex) {
             throw new FusekiException("Failed to start server: " + 
ex.getMessage(), ex);
         }
-        return server.start();
     }
 
     public static FusekiServer construct(String... args) {
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java
index 2fb8b0de29..8c1c62d19c 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java
@@ -106,7 +106,7 @@ public class FMod_UI implements FusekiModule {
         if ( uiAppLocation == null ) {
             uiAppLocation = findFusekiApp(serverCtl);
             if ( uiAppLocation == null ) {
-                LOG.warn("No Static content location has been found");
+                LOG.warn("No static content location");
                 return;
             }
         } else {