Fix get node log admin ws

enioka-Haute-Couture · Oct 30, 2024 · 05608d4 · 05608d4
1 parent d7e63d4
commit 05608d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...i-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java b/...i-client/jqm-api-client-jdbc/src/main/java/com/enioka/jqm/client/jdbc/api/JdbcClient.java
@@ -69,7 +69,7 @@
 /**
  * Main JQM client API entry point.
  */
-final class JdbcClient implements JqmClient, JqmClientEnqueueCallback, JqmClientQuerySubmitCallback
+public final class JdbcClient implements JqmClient, JqmClientEnqueueCallback, JqmClientQuerySubmitCallback
 {
     private static Logger jqmlogger = LoggerFactory.getLogger(JdbcClient.class);
     private static final int IN_CLAUSE_LIMIT = 500;
@@ -1014,7 +1014,8 @@ private String getStringPredicate(String fieldName, List<String> filterValues, L
 
     private String getIntPredicate(String fieldName, Integer filterValue, List<Object> prms)
     {
-        if (filterValue == null) {
+        if (filterValue == null)
+        {
             return "";
         }
         return getLongPredicate(fieldName, filterValue.longValue(), prms);

diff --git a/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java b/jqm-all/jqm-ws/src/main/java/com/enioka/jqm/ws/api/ServiceAdmin.java
@@ -35,6 +35,7 @@
 import com.enioka.api.admin.RUserDto;
 import com.enioka.api.admin.VersionDto;
 import com.enioka.jqm.client.api.JqmClientException;
+import com.enioka.jqm.client.jdbc.api.JdbcClient;
 import com.enioka.jqm.jdbc.DbConn;
 import com.enioka.jqm.model.GlobalParameter;
 import com.enioka.jqm.model.JobDef;
@@ -747,12 +748,9 @@ public InputStream getNewCertificate(@PathParam("id") long userId)
     @GET
     public InputStream SS(@PathParam("nodeName") String nodeName, @QueryParam("latest") int latest, @Context HttpServletResponse res)
     {
-        // TODO
-        /*
-         * InputStream fs = ((JdbcClient) JqmClientFactory.getClient()).getEngineLog(nodeName, latest); res.setHeader("Content-Disposition",
-         * "attachment; filename=" + nodeName + ".log"); return fs;
-         */
 
-        return null;
+        InputStream fs = ((JdbcClient) Helpers.getClient()).getEngineLog(nodeName, latest);
+        res.setHeader("Content-Disposition", "attachment; filename=" + nodeName + ".log");
+        return fs;
     }
 }