Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
cc1e7378
Commit
cc1e7378
authored
Jun 04, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
returned delete id and increased proxy_connect_timeout
parent
64433d8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
nginx.conf
docker-compose/nginx.conf
+7
-0
ToscaTemplateApiController.java
.../java/nl/uva/sne/drip/api/ToscaTemplateApiController.java
+1
-1
DRIPService.java
...er/src/main/java/nl/uva/sne/drip/service/DRIPService.java
+2
-2
No files found.
docker-compose/nginx.conf
View file @
cc1e7378
worker_processes
auto
;
events
{
worker_connections
1024
;
...
...
@@ -7,6 +8,12 @@ events {
}
http
{
proxy_connect_timeout
1200
;
proxy_send_timeout
1200
;
proxy_read_timeout
1200
;
send_timeout
1200
;
tcp_nodelay
on
;
# this is necessary for us to be able to disable request buffering in all cases
...
...
manager/src/main/java/nl/uva/sne/drip/api/ToscaTemplateApiController.java
View file @
cc1e7378
...
...
@@ -54,7 +54,7 @@ public class ToscaTemplateApiController implements ToscaTemplateApi {
if
(
accept
!=
null
&&
accept
.
contains
(
"text/plain"
))
{
try
{
dripService
.
delete
(
id
,
nodeName
);
return
new
ResponseEntity
<>(
""
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
id
,
HttpStatus
.
OK
);
}
catch
(
IOException
|
ApiException
|
TypeExeption
|
TimeoutException
|
InterruptedException
ex
)
{
java
.
util
.
logging
.
Logger
.
getLogger
(
ToscaTemplateApiController
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
return
new
ResponseEntity
<>(
HttpStatus
.
INTERNAL_SERVER_ERROR
);
...
...
manager/src/main/java/nl/uva/sne/drip/service/DRIPService.java
View file @
cc1e7378
...
...
@@ -67,8 +67,8 @@ public class DRIPService {
message
.
setToscaTemplate
(
toscaTemplate
);
caller
.
setRequestQeueName
(
requestQeueName
);
Message
plannerR
esponse
=
caller
.
call
(
message
);
ToscaTemplate
updatedToscaTemplate
=
plannerR
esponse
.
getToscaTemplate
();
Message
r
esponse
=
caller
.
call
(
message
);
ToscaTemplate
updatedToscaTemplate
=
r
esponse
.
getToscaTemplate
();
caller
.
close
();
return
toscaTemplateService
.
save
(
updatedToscaTemplate
);
...
...
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