diff --git a/org_ccalm_dbms.yml b/org_ccalm_dbms.yml index 35ea3f0..e242cf7 100644 --- a/org_ccalm_dbms.yml +++ b/org_ccalm_dbms.yml @@ -13,8 +13,9 @@ spring: application: name: org-ccalm-dbms datasource: + url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_dbms&connectTimeout=10000&socketTimeout=30000 #url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_dbms&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 - url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_dbms&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 + #url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_dbms&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 username: postgres password: 309A86FF65A78FB428F4E38DFE35F730 driver-class-name: org.postgresql.Driver diff --git a/pom.xml b/pom.xml index fa1b64a..1a27ac2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.5.5 org.ccalm @@ -119,6 +119,12 @@ provided + + net.logstash.logback + logstash-logback-encoder + 8.1 + + diff --git a/src/main/java/org/ccalm/dbms/SpringContext.java b/src/main/java/org/ccalm/dbms/SpringContext.java index 5b2e491..2ae2644 100644 --- a/src/main/java/org/ccalm/dbms/SpringContext.java +++ b/src/main/java/org/ccalm/dbms/SpringContext.java @@ -1,16 +1,23 @@ package org.ccalm.dbms; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.MarkerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component public class SpringContext implements ApplicationContextAware { + private static final Logger logger = LoggerFactory.getLogger(SpringContext.class); private static ApplicationContext context; @Override public void setApplicationContext(ApplicationContext applicationContext) { context = applicationContext; + logger.warn(MarkerFactory.getMarker(UUID.randomUUID().toString()),"App is start"); } public static ApplicationContext getApplicationContext() { diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index ab561eb..4f1e9b8 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,6 +1,7 @@ + @@ -8,8 +9,39 @@ ${LOGS}/${appName}.log - - {"timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}","thread":"[%thread]","level":"%level","logger":"%logger{36}","marker":"%marker","message":"%msg","exception":"%exOneLine"}%n + + + + timestamp + level + message + exception + [ignore] + [ignore] + [ignore] + [ignore] + [ignore] + + + + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + UTC + + + true + + + false + false + + + + 1 + 1024 + 20 + $$FastClassByCGLIB$$ + $$EnhancerBySpringCGLIB$$ + ${LOGS}/${appName}.%d{yyyy-MM-dd}.%i.log @@ -27,10 +59,9 @@ - - + \ No newline at end of file