This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new e64198fd4 [ISSUES-4120]UserIp and Tenant Label Code optimization
(#4119)
e64198fd4 is described below
commit e64198fd477b300625d0782923ee137fb0b51936
Author: huangKai-2323 <[email protected]>
AuthorDate: Thu Feb 16 15:01:50 2023 +0800
[ISSUES-4120]UserIp and Tenant Label Code optimization (#4119)
* Code optimization
---
.../linkis/entrance/interceptor/impl/TenantLabelSetUtils.scala | 7 ++++++-
.../linkis/entrance/interceptor/impl/UserCreatorIPCheckUtils.scala | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TenantLabelSetUtils.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TenantLabelSetUtils.scala
index 20f1e61a7..59c890764 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TenantLabelSetUtils.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TenantLabelSetUtils.scala
@@ -47,7 +47,7 @@ object TenantLabelSetUtils extends Logging {
.build(new CacheLoader[String, String]() {
override def load(userCreatorLabel: String): String = {
- Utils.tryAndWarn {
+ var cacheValue = Utils.tryAndWarn {
val sender: Sender = Sender
.getSender(Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue)
val user = userCreatorLabel.split("-")(0)
@@ -60,6 +60,11 @@ object TenantLabelSetUtils extends Logging {
""
}
}
+ if (StringUtils.isNotBlank(cacheValue)) {
+ logger.warn(s"TenantCache data loading failed , plaese check warn
log")
+ cacheValue = ""
+ }
+ cacheValue
}
})
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/UserCreatorIPCheckUtils.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/UserCreatorIPCheckUtils.scala
index ee7fe6d96..16ff5c0dd 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/UserCreatorIPCheckUtils.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/UserCreatorIPCheckUtils.scala
@@ -44,7 +44,7 @@ object UserCreatorIPCheckUtils extends Logging {
.build(new CacheLoader[String, String]() {
override def load(userCreatorLabel: String): String = {
- Utils.tryAndWarn {
+ var cacheValue = Utils.tryAndWarn {
val sender: Sender = Sender
.getSender(Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue)
val user = userCreatorLabel.split("-")(0)
@@ -56,6 +56,11 @@ object UserCreatorIPCheckUtils extends Logging {
""
}
}
+ if (StringUtils.isNotBlank(cacheValue)) {
+ logger.warn(s"UserIpCache data loading failed , plaese check warn
log")
+ cacheValue = ""
+ }
+ cacheValue
}
})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
