提交 682020d7 编写于 作者: 如梦技术's avatar 如梦技术 🐛

🐛 修复 mica-logging gite #I3CVAT

上级 90213b78
......@@ -42,6 +42,7 @@ spring:
| ----- | ------ | ------ |
| mica.logging.use-json-format | false | 使用 json 格式化,设置后文件打印 json 日志,可用于 filebeat 收集日志文件 |
| mica.logging.console.close-after-start | false | 是否启动完成后将自动关闭控制台日志,默认**false****非开发环境**建议设置为 **true** |
| mica.logging.files.enabled | true | 是否打印文件 `all.log``error.log` |
| mica.logging.logstash.enabled | false | 是否开启 logstash 日志收集,直接收集到 logstash |
| mica.logging.logstash.host | localhost | logstash host |
| mica.logging.logstash.port | 5000 | logstash port |
......
......@@ -211,7 +211,7 @@ public class LoggingUtil {
SizeAndTimeBasedRollingPolicy<ILoggingEvent> rollingPolicy = new SizeAndTimeBasedRollingPolicy<>();
rollingPolicy.setContext(context);
rollingPolicy.setCleanHistoryOnStart(SystemUtil.getPropToBool(LogbackLoggingSystemProperties.ROLLINGPOLICY_CLEAN_HISTORY_ON_START, false));
rollingPolicy.setFileNamePattern(logErrorFile + ".%d{yyyy-MM-dd}.%i.gz}");
rollingPolicy.setFileNamePattern(logErrorFile + ".%d{yyyy-MM-dd}.%i.gz");
rollingPolicy.setMaxFileSize(FileSize.valueOf(SystemUtil.getProp(LogbackLoggingSystemProperties.ROLLINGPOLICY_MAX_FILE_SIZE, "10MB")));
rollingPolicy.setMaxHistory(SystemUtil.getPropToInt(LogbackLoggingSystemProperties.ROLLINGPOLICY_MAX_HISTORY, 7));
rollingPolicy.setTotalSizeCap(FileSize.valueOf(SystemUtil.getProp(LogbackLoggingSystemProperties.ROLLINGPOLICY_TOTAL_SIZE_CAP, "0")));
......
......@@ -29,14 +29,16 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
@Getter
@Setter
@RefreshScope
@ConfigurationProperties("mica.logging")
@ConfigurationProperties(MicaLoggingProperties.PREFIX)
public class MicaLoggingProperties {
public static final String PREFIX = "mica.logging";
/**
* 使用 json 格式化
*/
private boolean useJsonFormat = false;
private final Console console = new Console();
private final Files files = new Files();
private final Logstash logstash = new Logstash();
@Getter
......@@ -48,9 +50,20 @@ public class MicaLoggingProperties {
private boolean closeAfterStart = false;
}
@Getter
@Setter
public static class Files {
public static final String PREFIX = MicaLoggingProperties.PREFIX + ".files";
/**
* 是否开启文件日志
*/
private boolean enabled = true;
}
@Getter
@Setter
public static class Logstash {
public static final String PREFIX = MicaLoggingProperties.PREFIX + ".logstash";
/**
* 是否开启 logstash 日志收集
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册