Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: modify the verification method of es address and port #417

Merged
merged 2 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
wtt40122 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright (C) 2020 Xiaomi Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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("localhost");
// method.invoke(milogMiddlewareConfigService, miLogResource);
// Assert.assertEquals("localhost:80", miLogResource.getServiceUrl());
//
// miLogResource.setServiceUrl("localhost:80");
// method.invoke(milogMiddlewareConfigService, miLogResource);
// Assert.assertEquals("localhost:80", miLogResource.getServiceUrl());
//
// miLogResource.setServiceUrl("localhost:");
// method.invoke(milogMiddlewareConfigService, miLogResource);
// Assert.assertEquals("localhost:80", miLogResource.getServiceUrl());
// }

}
Loading