From fe1fad6a7b615bf52238fd5b1900961d4623e8d5 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 3 Oct 2022 14:49:02 +0800 Subject: [PATCH] feat: tempory skip cycle reference check --- .../src/main/resources/application.properties | 3 +++ .../java/tech/powerjob/worker/log/impl/OmsStdOutLogger.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/application.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application.properties index da2ab869..9f65c568 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/application.properties +++ b/powerjob-server/powerjob-server-starter/src/main/resources/application.properties @@ -13,6 +13,9 @@ spring.servlet.multipart.file-size-threshold=0 spring.servlet.multipart.max-file-size=209715200 spring.servlet.multipart.max-request-size=209715200 +# temporary skip circular references check +spring.main.allow-circular-references=true + ###### PowerJob self-owned configuration (The following properties should exist in application.properties only). ###### # Akka ActorSystem port. oms.akka.port=10086 diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/log/impl/OmsStdOutLogger.java b/powerjob-worker/src/main/java/tech/powerjob/worker/log/impl/OmsStdOutLogger.java index 141275cd..dd35fc57 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/log/impl/OmsStdOutLogger.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/log/impl/OmsStdOutLogger.java @@ -11,6 +11,8 @@ import tech.powerjob.common.model.LogConfig; */ public class OmsStdOutLogger extends AbstractOmsLogger { + private static final String PREFIX = "[PowerJob] [%s] "; + public OmsStdOutLogger(LogConfig logConfig) { super(logConfig); } @@ -36,6 +38,6 @@ public class OmsStdOutLogger extends AbstractOmsLogger { } private static String buildStdOut(LogLevel logLevel, String messagePattern, Object... args) { - return logLevel.name().concat("-").concat(genLogContent(messagePattern, args)); + return String.format(PREFIX, logLevel.name()).concat(genLogContent(messagePattern, args)); } }