Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-boot-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-boot-admin
Commits
c95521e8
Commit
c95521e8
authored
May 29, 2018
by
Johannes Edmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
desperate attempt to improve execution time and stability of tests in ci
parent
ae8596cd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
13 deletions
+37
-13
AbstractInstancesProxyController.java
...ot/admin/server/web/AbstractInstancesProxyController.java
+1
-1
AbstractInstancesProxyControllerIntegrationTest.java
.../web/AbstractInstancesProxyControllerIntegrationTest.java
+0
-0
InstancesProxyControllerIntegrationTest.java
...web/reactive/InstancesProxyControllerIntegrationTest.java
+18
-6
InstancesProxyControllerIntegrationTest.java
.../web/servlet/InstancesProxyControllerIntegrationTest.java
+18
-6
No files found.
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/AbstractInstancesProxyController.java
View file @
c95521e8
...
...
@@ -111,7 +111,7 @@ public class AbstractInstancesProxyController {
log
.
trace
(
"No Endpoint found for Proxy-Request for instance {} with URL '{}'"
,
instance
.
getId
(),
uri
);
return
ClientResponse
.
create
(
HttpStatus
.
NOT_FOUND
,
strategies
).
build
();
})).
onErrorResume
(
IOException
.
class
,
ex
->
Mono
.
fromSupplier
(()
->
{
log
.
trace
(
"Error for Proxy-Request for instance {} with URL '{}'
timed out
"
,
instance
.
getId
(),
uri
,
ex
);
log
.
trace
(
"Error for Proxy-Request for instance {} with URL '{}'
errored
"
,
instance
.
getId
(),
uri
,
ex
);
return
ClientResponse
.
create
(
HttpStatus
.
BAD_GATEWAY
,
strategies
).
build
();
})).
onErrorResume
(
ConnectException
.
class
,
ex
->
Mono
.
fromSupplier
(()
->
{
log
.
trace
(
"Error for Proxy-Request for instance {} with URL '{}' timed out"
,
instance
.
getId
(),
uri
,
ex
);
...
...
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/AbstractInstancesProxyControllerIntegrationTest.java
View file @
c95521e8
This diff is collapsed.
Click to expand it.
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/reactive/InstancesProxyControllerIntegrationTest.java
View file @
c95521e8
...
...
@@ -19,16 +19,28 @@ package de.codecentric.boot.admin.server.web.reactive;
import
de.codecentric.boot.admin.server.AdminReactiveApplicationTest
;
import
de.codecentric.boot.admin.server.web.AbstractInstancesProxyControllerIntegrationTest
;
import
org.junit.AfterClass
;
import
org.junit.BeforeClass
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.context.ConfigurableApplicationContext
;
public
class
InstancesProxyControllerIntegrationTest
extends
AbstractInstancesProxyControllerIntegrationTest
{
@Override
protected
ConfigurableApplicationContext
setupContext
()
{
return
new
SpringApplicationBuilder
().
sources
(
AdminReactiveApplicationTest
.
TestAdminApplication
.
class
)
.
web
(
WebApplicationType
.
REACTIVE
)
.
run
(
"--server.port=0"
,
"--eureka.client.enabled=false"
,
"--spring.boot.admin.monitor.read-timeout=3000"
);
private
static
ConfigurableApplicationContext
context
;
@BeforeClass
public
static
void
setUpCpntext
()
{
context
=
new
SpringApplicationBuilder
().
sources
(
AdminReactiveApplicationTest
.
TestAdminApplication
.
class
)
.
web
(
WebApplicationType
.
REACTIVE
)
.
run
(
"--server.port=0"
,
"--eureka.client.enabled=false"
,
"--spring.boot.admin.monitor.read-timeout=5000"
);
AbstractInstancesProxyControllerIntegrationTest
.
setUpClient
(
context
);
}
@AfterClass
public
static
void
tearDownContext
()
{
if
(
context
!=
null
)
{
context
.
close
();
}
}
}
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/servlet/InstancesProxyControllerIntegrationTest.java
View file @
c95521e8
...
...
@@ -19,16 +19,28 @@ package de.codecentric.boot.admin.server.web.servlet;
import
de.codecentric.boot.admin.server.AdminServletApplicationTest
;
import
de.codecentric.boot.admin.server.web.AbstractInstancesProxyControllerIntegrationTest
;
import
org.junit.AfterClass
;
import
org.junit.BeforeClass
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.context.ConfigurableApplicationContext
;
public
class
InstancesProxyControllerIntegrationTest
extends
AbstractInstancesProxyControllerIntegrationTest
{
@Override
protected
ConfigurableApplicationContext
setupContext
()
{
return
new
SpringApplicationBuilder
().
sources
(
AdminServletApplicationTest
.
TestAdminApplication
.
class
)
.
web
(
WebApplicationType
.
SERVLET
)
.
run
(
"--server.port=0"
,
"--eureka.client.enabled=false"
,
"--spring.boot.admin.monitor.read-timeout=3000"
);
private
static
ConfigurableApplicationContext
context
;
@BeforeClass
public
static
void
setUpCpntext
()
{
context
=
new
SpringApplicationBuilder
().
sources
(
AdminServletApplicationTest
.
TestAdminApplication
.
class
)
.
web
(
WebApplicationType
.
SERVLET
)
.
run
(
"--server.port=0"
,
"--eureka.client.enabled=false"
,
"--spring.boot.admin.monitor.read-timeout=5000"
);
AbstractInstancesProxyControllerIntegrationTest
.
setUpClient
(
context
);
}
@AfterClass
public
static
void
tearDownContext
()
{
if
(
context
!=
null
)
{
context
.
close
();
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment