-
Notifications
You must be signed in to change notification settings - Fork 93
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 Hubble graph connect error #378
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,6 @@ | |
package org.apache.hugegraph.config; | ||
|
||
import org.apache.hugegraph.handler.CustomInterceptor; | ||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | ||
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; | ||
|
@@ -43,7 +42,6 @@ public void addInterceptors(InterceptorRegistry registry) { | |
.addPathPatterns("/**"); | ||
} | ||
|
||
@Bean | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
public CustomInterceptor customInterceptor() { | ||
return new CustomInterceptor(); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Licensed to the Apache Software Foundation (ASF) under one or more | ||
contributor license agreements. See the NOTICE file distributed with | ||
this work for additional information regarding copyright ownership. | ||
The ASF licenses this file to You 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. | ||
--> | ||
<configuration status="error"> | ||
<Properties> | ||
<property name="log-charset">UTF-8</property> | ||
</Properties> | ||
<appenders> | ||
<Console name="console" target="SYSTEM_OUT"> | ||
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/> | ||
<PatternLayout charset="${log-charset}" pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%-5p] %c{1.} %x - %m%n" /> | ||
</Console> | ||
|
||
<RollingRandomAccessFile name="file" fileName="logs/hugegraph-hubble.log" | ||
filePattern="logs/hugegraph-hubble-%d{yyyy-MM-dd}-%i.log"> | ||
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/> | ||
<PatternLayout charset="${log-charset}" pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%-5p] %c{1.} %x - %m%n" /> | ||
<!-- Trigger after exceeding 1day or 100MB --> | ||
<Policies> | ||
<SizeBasedTriggeringPolicy size="100MB"/> | ||
<TimeBasedTriggeringPolicy interval="1" modulate="true" /> | ||
</Policies> | ||
<!-- Keep max 5 files per day & auto delete after over 1GB or 100 files --> | ||
<DefaultRolloverStrategy max="5"> | ||
<Delete basePath="logs" maxDepth="2"> | ||
<IfFileName glob="*/*.log"/> | ||
<!-- Limit log amount & size --> | ||
<IfAny> | ||
<IfAccumulatedFileSize exceeds="1GB" /> | ||
<IfAccumulatedFileCount exceeds="100" /> | ||
</IfAny> | ||
</Delete> | ||
</DefaultRolloverStrategy> | ||
</RollingRandomAccessFile> | ||
</appenders> | ||
<loggers> | ||
<root level="INFO"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</root> | ||
<logger name="org.apache.cassandra" level="WARN" additivity="false"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</logger> | ||
<logger name="org.apache.hadoop" level="WARN" additivity="false"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</logger> | ||
<logger name="io.netty" level="WARN" additivity="false"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</logger> | ||
<logger name="org.apache.commons" level="WARN" additivity="false"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</logger> | ||
|
||
<logger name="org.apache.hugegraph" level="INFO" additivity="false"> | ||
<appender-ref ref="file"/> | ||
<appender-ref ref="console"/> | ||
</logger> | ||
</loggers> | ||
</configuration> |
56 changes: 56 additions & 0 deletions
56
hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/GraphConnectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you 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 org.apache.hugegraph.unit; | ||
|
||
import org.apache.hugegraph.HugeGraphHubble; | ||
import org.apache.hugegraph.common.Constant; | ||
import org.apache.hugegraph.common.Response; | ||
import org.apache.hugegraph.entity.GraphConnection; | ||
import org.apache.hugegraph.testutil.Assert; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.boot.test.web.client.TestRestTemplate; | ||
import org.springframework.test.context.TestPropertySource; | ||
import org.springframework.test.context.junit4.SpringRunner; | ||
|
||
@RunWith(SpringRunner.class) | ||
@TestPropertySource("classpath:application.properties") | ||
@SpringBootTest(classes = HugeGraphHubble.class, webEnvironment = | ||
SpringBootTest.WebEnvironment.RANDOM_PORT) | ||
public class GraphConnectionTest { | ||
|
||
private static final String HOST = "127.0.0.1"; | ||
private static final int PORT = 8080; | ||
|
||
@Autowired | ||
private TestRestTemplate testRestTemplate; | ||
|
||
@Test | ||
public void testGraphConnect() { | ||
GraphConnection entry = | ||
GraphConnection.builder().host(HOST).port(PORT).name("test").graph( | ||
"hugegraph").build(); | ||
Response response = testRestTemplate.postForObject( | ||
Constant.API_VERSION + "graph-connections", | ||
entry, Response.class); | ||
Assert.assertEquals(response.getMessage(), 200, response.getStatus()); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we should perform unit-test of the hubble-be module instead of the hubble module.