Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
schbrain-parent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
panwangnan
schbrain-parent
Commits
37664e38
Commit
37664e38
authored
May 02, 2023
by
liaozan
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace logfile namespace constants with configuration
parent
76a1295e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java
...ogger/listener/LoggerPropertiesPreparedEventListener.java
+5
-4
starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
...ork/autoconfigure/logger/properties/LoggerProperties.java
+2
-0
starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json
...ain/resources/META-INF/spring-configuration-metadata.json
+6
-0
No files found.
starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java
View file @
37664e38
package
com.schbrain.framework.autoconfigure.logger.listener
;
import
cn.hutool.core.text.StrPool
;
import
cn.hutool.system.SystemUtil
;
import
com.ctrip.framework.apollo.ConfigFile
;
import
com.ctrip.framework.apollo.ConfigService
;
...
...
@@ -31,7 +32,7 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
ConfigurableEnvironment
environment
=
event
.
getEnvironment
();
Map
<
String
,
String
>
hostInfoProperties
=
buildHostInfoProperties
();
event
.
getPropertySource
().
addProperties
(
hostInfoProperties
);
configLoggingFileLocation
(
environment
);
configLoggingFileLocation
(
environment
,
properties
.
getLogConfigNamespace
()
);
new
LoggerConfigurationInitializer
(
environment
,
properties
).
init
();
}
...
...
@@ -49,11 +50,11 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
* @see org.springframework.boot.context.logging.LoggingApplicationListener#initializeSystem(ConfigurableEnvironment, org.springframework.boot.logging.LoggingSystem, org.springframework.boot.logging.LogFile)
*/
@SuppressWarnings
(
"JavadocReference"
)
private
void
configLoggingFileLocation
(
ConfigurableEnvironment
environment
)
{
private
void
configLoggingFileLocation
(
ConfigurableEnvironment
environment
,
String
logConfigNamespace
)
{
if
(
environment
.
containsProperty
(
CONFIG_PROPERTY
))
{
return
;
}
ConfigFile
loggingConfiguration
=
ConfigService
.
getConfigFile
(
"logback-spring"
,
ConfigFileFormat
.
XML
);
ConfigFile
loggingConfiguration
=
ConfigService
.
getConfigFile
(
logConfigNamespace
,
ConfigFileFormat
.
XML
);
String
content
=
loggingConfiguration
.
getContent
();
if
(!
StringUtils
.
hasText
(
content
))
{
log
.
warn
(
"empty logging configuration, reinitialize loggingSystem is disabled"
);
...
...
@@ -62,7 +63,7 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
String
loggerConfigurationLocation
=
null
;
String
tempDir
=
SystemUtil
.
getUserInfo
().
getTempDir
();
Path
storeLocation
=
Paths
.
get
(
tempDir
,
"logback-spring.xml"
);
Path
storeLocation
=
Paths
.
get
(
tempDir
,
logConfigNamespace
+
StrPool
.
DOT
+
ConfigFileFormat
.
XML
.
getValue
()
);
try
{
loggerConfigurationLocation
=
Files
.
writeString
(
storeLocation
,
content
).
toString
();
}
catch
(
IOException
e
)
{
...
...
starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
View file @
37664e38
...
...
@@ -27,6 +27,8 @@ public class LoggerProperties extends ConfigurableProperties implements Priority
private
String
logstashAddress
;
private
String
logConfigNamespace
=
"logback-spring"
;
private
String
logPath
=
DEFAULT_LOG_PATH
;
private
int
maxHistory
=
(
int
)
Duration
.
ofDays
(
30
).
toDays
();
...
...
starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json
View file @
37664e38
...
...
@@ -25,6 +25,12 @@
"sourceType"
:
"com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties"
,
"defaultValue"
:
false
},
{
"name"
:
"schbrain.logging.file.log-config-namespace"
,
"type"
:
"java.lang.String"
,
"sourceType"
:
"com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties"
,
"defaultValue"
:
"logback-spring"
},
{
"name"
:
"schbrain.logging.file.log-path"
,
"type"
:
"java.lang.String"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment