lanyuanxiaoyao/hudi-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(log): 优化日志输出 增加ip和hostname全名

Browse Source
This commit is contained in:
兰缘小妖
2024-02-01 17:38:54 +08:00
parent ba24b4e5a6
commit 2fa18fa4f8
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
View File

@@ -15,13 +15,13 @@ security_darkcode='${runtime.security.darkcode}'
<#list hosts as host> <#list hosts as host>
host=${host} host=${host}
hostname=`ssh $host 'echo $HOSTNAME'` hostname=`ssh $host 'hostname -f'`
echo "${info.name} $host $hostname $datetime" echo "${info.name} $host $hostname $datetime"
ssh $host 'bash -s' < stop.sh ${runtime.jarPath}/${info.name}.jar ssh $host 'bash -s' < stop.sh ${runtime.jarPath}/${info.name}.jar
<#if selectedHosts?seq_contains(host)> <#if selectedHosts?seq_contains(host)>
ssh $host "mkdir -p ${runtime.jarPath};curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/${info.sourceJar} -o ${runtime.jarPath}/${info.name}.jar" ssh $host "mkdir -p ${runtime.jarPath};curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/${info.sourceJar} -o ${runtime.jarPath}/${info.name}.jar"
start_time=`date +%Y%m%d%H%M%S` start_time=`date +%Y%m%d%H%M%S`
ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.cloud.zookeeper.discovery.metadata.startTime=${start_time} --spring.cloud.zookeeper.discovery.metadata.hostIp=${host} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &" ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.cloud.zookeeper.discovery.metadata.startTime=${start_time} --spring.cloud.zookeeper.discovery.metadata.hostIp=${host} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
</#if> </#if>
echo '' echo ''
</#list> </#list>

2
service-configuration/src/main/resources/application-discovery-eureka.yml
View File

@@ -2,7 +2,7 @@ eureka:
instance: instance:
hostname: localhost hostname: localhost
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${datetime} instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${deploy.datetime}
client: client:
enabled: false enabled: false
service-url: service-url:

2
service-configuration/src/main/resources/application-discovery.yml
View File

@@ -6,6 +6,6 @@ spring:
discovery: discovery:
enabled: ${spring.cloud.zookeeper.enabled} enabled: ${spring.cloud.zookeeper.enabled}
root: /hudi-services root: /hudi-services
instance-id: ${spring.application.name}-${hostname}-${random.uuid}-${datetime:19700101} instance-id: ${spring.application.name}-${deploy.hostname}-${random.uuid}-${deploy.datetime:19700101}
metadata: metadata:
discovery: zookeeper discovery: zookeeper

4
service-web/src/main/resources/logback-spring.xml
View File

@@ -6,6 +6,8 @@
<springProperty scope="context" name="LOKI_PUSH_URL" source="loki.url"/> <springProperty scope="context" name="LOKI_PUSH_URL" source="loki.url"/>
<springProperty scope="context" name="LOGGING_PARENT" source="logging.parent"/> <springProperty scope="context" name="LOGGING_PARENT" source="logging.parent"/>
<springProperty scope="context" name="APP_NAME" source="spring.application.name"/> <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
<springProperty scope="context" name="DEPLOY_HOSTNAME" source="deploy.hostname"/>
<springProperty scope="context" name="DEPLOY_IP" source="deploy.ip"/>
<appender name="Loki" class="com.github.loki4j.logback.Loki4jAppender"> <appender name="Loki" class="com.github.loki4j.logback.Loki4jAppender">
<metricsEnabled>true</metricsEnabled> <metricsEnabled>true</metricsEnabled>
@@ -14,7 +16,7 @@
</http> </http>
<format> <format>
<label> <label>
<pattern>app=${APP_NAME:-none},host=${HOSTNAME:-none},level=%level</pattern> <pattern>app=${APP_NAME:-none},host=${DEPLOY_HOSTNAME:-none},ip=${DEPLOY_IP:-none},level=%level</pattern>
<readMarkers>true</readMarkers> <readMarkers>true</readMarkers>
</label> </label>
<message> <message>