Skip to content

Commit

Permalink
fix: modify the verification method of es address apache#416
Browse files Browse the repository at this point in the history
  • Loading branch information
songyutong1 authored and songyutong committed Aug 23, 2024
1 parent a27b435 commit d1becbc
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,18 @@ public Result<String> resourceOperate(MiLogResource miLogResource) {

private void checkEsAddressPortOperate(MiLogResource miLogResource) {
String serviceUrl = miLogResource.getServiceUrl();
String portStr = serviceUrl.substring(serviceUrl.lastIndexOf(":") + 1);
if (StringUtils.isBlank(portStr)) {
if (StringUtils.isBlank(serviceUrl)) {
return;
}

int index = serviceUrl.lastIndexOf(":");
if (index == -1) {
serviceUrl = String.format("%s:%s", serviceUrl, "80");
} else {
String portStr = serviceUrl.substring(index + 1);
if (StringUtils.isBlank(portStr)) {
serviceUrl = String.format("%s%s", serviceUrl, "80");
}
}
miLogResource.setServiceUrl(serviceUrl);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.xiaomi.mone.log.manager.service.impl;

import com.xiaomi.mone.log.api.model.bo.MiLogResource;
import static com.xiaomi.mone.log.manager.common.utils.ManagerUtil.getConfigFromNanos;
import com.xiaomi.youpin.docean.Ioc;
import org.junit.Assert;
import org.junit.Test;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

/**
* @author: songyutong1
* @date: 2024/08/22/15:15
*/
public class MilogMiddlewareConfigServiceImplTest {

@Test
public void testCheckEsAddressPortOperate() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
getConfigFromNanos();
Ioc.ins().init("com.xiaomi");
MilogMiddlewareConfigServiceImpl milogMiddlewareConfigService = Ioc.ins().getBean(MilogMiddlewareConfigServiceImpl.class);
Method method = milogMiddlewareConfigService.getClass().getDeclaredMethod("checkEsAddressPortOperate", MiLogResource.class);
method.setAccessible(true);

MiLogResource miLogResource = new MiLogResource();
miLogResource.setServiceUrl("zjynewretail.api.es.srv");
method.invoke(milogMiddlewareConfigService, miLogResource);
Assert.assertEquals("zjynewretail.api.es.srv:80", miLogResource.getServiceUrl());

miLogResource.setServiceUrl("zjynewretail.api.es.srv:80");
method.invoke(milogMiddlewareConfigService, miLogResource);
Assert.assertEquals("zjynewretail.api.es.srv:80", miLogResource.getServiceUrl());

miLogResource.setServiceUrl("zjynewretail.api.es.srv:");
method.invoke(milogMiddlewareConfigService, miLogResource);
Assert.assertEquals("zjynewretail.api.es.srv:80", miLogResource.getServiceUrl());
}

}

0 comments on commit d1becbc

Please sign in to comment.