Merge pull request #180 from iExecBlockchainComputing/log

Add docker-compose & highlight important log messages (bad version, out of gas...)

Author: zguesmi

docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3.4'
+
+
+networks:
+  iexec-net:
+    external: true
+
+services:
+  worker:
+    image: nexus.iex.ec/iexec-worker:${WORKER_VERSION}
+    container_name: worker
+    environment:
+      - IEXEC_CORE_HOST=core
+      - IEXEC_CORE_PORT=18090
+      - IEXEC_WORKER_NAME=worker
+      - IEXEC_WORKER_WALLET_PATH=/iexec-wallets/encrypted-wallet_worker1.json
+      - IEXEC_WORKER_RESULT_BASE_DIR=/tmp/iexec-worker
+    ports:
+      - 18091:18091
+    volumes:
+      - ./src/main/resources/wallet/encrypted-wallet_worker1.json:/iexec-wallets/encrypted-wallet_worker1.json
+      - /tmp/iexec-worker/worker:/tmp/iexec-worker/worker
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: on-failure
+    networks:
+      - iexec-net

src/main/java/com/iexec/worker/Application.java

@@ -9,6 +9,7 @@
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.feign.CustomFeignClient;
 import com.iexec.worker.result.ResultService;
+import com.iexec.worker.utils.LoggingUtils;
 import com.iexec.worker.utils.version.VersionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,13 +88,17 @@ public void run(String... args) {
 
         if (!publicConfiguration.getRequiredWorkerVersion().isEmpty() &&
                 !versionService.getVersion().equals(publicConfiguration.getRequiredWorkerVersion())) {
-            log.error("Bad version, please upgrade your iexec-worker [current:{}, required:{}]",
+
+            String badVersion = String.format("Bad version! please upgrade your iexec-worker [current:%s, required:%s]",
                     versionService.getVersion(), publicConfiguration.getRequiredWorkerVersion());
+
+            LoggingUtils.printHighlightedMessage(badVersion);
             System.exit(0);
         }
 
         if (!iexecHubService.hasEnoughGas()) {
-            log.error("No enough gas, please refill your wallet!");
+            String noEnoughGas = String.format("No enough gas! please refill your wallet [walletAddress:%s]", workerAddress);
+            LoggingUtils.printHighlightedMessage(noEnoughGas);
             System.exit(0);
         }
 

src/main/java/com/iexec/worker/executor/TaskExecutorService.java

@@ -18,6 +18,7 @@
 import com.iexec.worker.feign.CustomFeignClient;
 import com.iexec.worker.result.ResultService;
 import com.iexec.worker.sms.SmsService;
+import com.iexec.worker.utils.LoggingUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -216,6 +217,9 @@ public void contribute(ContributionAuthorization contribAuth) {
 
         if (!contributionService.hasEnoughGas()) {
             customFeignClient.updateReplicateStatus(chainTaskId, OUT_OF_GAS);
+            String noEnoughGas = String.format("Out of gas! please refill your wallet [walletAddress:%s]",
+                    contribAuth.getWorkerWallet());
+            LoggingUtils.printHighlightedMessage(noEnoughGas);
             System.exit(0);
         }
 
@@ -250,6 +254,10 @@ public void reveal(String chainTaskId) {
 
         if (!revealService.hasEnoughGas()) {
             customFeignClient.updateReplicateStatus(chainTaskId, OUT_OF_GAS);
+            customFeignClient.updateReplicateStatus(chainTaskId, OUT_OF_GAS);
+            String noEnoughGas = String.format("Out of gas! please refill your wallet [walletAddress:%s]",
+                    workerConfigurationService.getWorkerWalletAddress());
+            LoggingUtils.printHighlightedMessage(noEnoughGas);
             System.exit(0);
         }
 

src/main/java/com/iexec/worker/utils/LoggingUtils.java

@@ -0,0 +1,20 @@
+package com.iexec.worker.utils;
+
+import java.util.Collections;
+
+public class LoggingUtils {
+
+
+    public static void printHighlightedMessage(String message) {
+        String hashtagSequence = String.join("", Collections.nCopies(message.length() + 2, "#"));
+        String spaceSequence = String.join("", Collections.nCopies(message.length(), " "));
+
+        System.out.println();
+        System.out.println("#"  +   hashtagSequence    + "#");
+        System.out.println("# " +    spaceSequence     + " #");
+        System.out.println("# " +       message        + " #");
+        System.out.println("# " +    spaceSequence     + " #");
+        System.out.println("#"  +   hashtagSequence    + "#");
+        System.out.println();
+    }
+}