Merge remote-tracking branch 'origin/fix/version-check' into fix/vers…

…ion-check
dice-group · Nov 27, 2024 · a5f2455 · a5f2455
2 parents ae151c6 + 90a0c65
commit a5f2455
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/check_version.yml b/.github/workflows/check_version.yml
@@ -1,7 +1,7 @@
 # Checks if version number has been updated 
 name: Version Check
 on: pull_request
-# on: push
+
 jobs:
   lint:
     name: Release Tag existence Check

diff --git a/src/main/java/org/aksw/iguana/cc/controller/MainController.java b/src/main/java/org/aksw/iguana/cc/controller/MainController.java
@@ -40,6 +40,9 @@ public Path convert(String value) {
 
         @Parameter(names = {"--version", "-v"}, description = "Outputs the version number of the program and result ontology.")
         private boolean version;
+
+        @Parameter(names = {"--log-success", "-ls"}, description = "Log successful queries.")
+        public static boolean logSuccess = false;
     }
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MainController.class);

diff --git a/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java
@@ -4,6 +4,7 @@
 import net.jpountz.xxhash.StreamingXXHash64;
 import net.jpountz.xxhash.XXHashFactory;
 import org.aksw.iguana.cc.config.elements.ConnectionConfig;
+import org.aksw.iguana.cc.controller.MainController;
 import org.aksw.iguana.cc.query.handler.QueryHandler;
 import org.aksw.iguana.cc.utils.http.RequestFactory;
 import org.aksw.iguana.cc.worker.ResponseBodyProcessor;
@@ -468,10 +469,12 @@ private static HttpExecutionResult createFailedResultDuringResponse(
 
     private void logExecution(ExecutionStats execution) {
         switch (execution.endState()) {
-            case SUCCESS -> LOGGER.debug("{}\t:: Successfully executed query: [queryID={}].", this, execution.queryID());
+            case SUCCESS -> {
+                if (MainController.Args.logSuccess) LOGGER.info("{}\t:: Successfully executed query: [queryID={}, duration={}].", this, execution.queryID(), execution.duration());
+            }
             case TIMEOUT -> LOGGER.warn("{}\t:: Timeout during query execution: [queryID={}, duration={}].", this, execution.queryID(), execution.duration()); // TODO: look for a possibility to add the query string for better logging
             case HTTP_ERROR -> LOGGER.warn("{}\t:: HTTP Error occurred during query execution: [queryID={}, httpError={}].", this, execution.queryID(), execution.httpStatusCode().orElse(-1));
-            case MISCELLANEOUS_EXCEPTION -> LOGGER.warn("{}\t:: Miscellaneous exception occurred during query execution: [queryID={}, exception={}].", this, execution.queryID(), execution.error().orElse(null));
+            case MISCELLANEOUS_EXCEPTION -> LOGGER.warn("{}\t:: Miscellaneous exception occurred during query execution: [queryID={}].", this, execution.queryID(), execution.error().orElse(null));
         }
     }