Commit cc1e7378 authored by Spiros Koulouzis's avatar Spiros Koulouzis

returned delete id and increased proxy_connect_timeout

parent 64433d8d
worker_processes auto; worker_processes auto;
events { events {
worker_connections 1024; worker_connections 1024;
...@@ -7,6 +8,12 @@ events { ...@@ -7,6 +8,12 @@ events {
} }
http { http {
proxy_connect_timeout 1200;
proxy_send_timeout 1200;
proxy_read_timeout 1200;
send_timeout 1200;
tcp_nodelay on; tcp_nodelay on;
# this is necessary for us to be able to disable request buffering in all cases # this is necessary for us to be able to disable request buffering in all cases
......
...@@ -54,7 +54,7 @@ public class ToscaTemplateApiController implements ToscaTemplateApi { ...@@ -54,7 +54,7 @@ public class ToscaTemplateApiController implements ToscaTemplateApi {
if (accept != null && accept.contains("text/plain")) { if (accept != null && accept.contains("text/plain")) {
try { try {
dripService.delete(id, nodeName); dripService.delete(id, nodeName);
return new ResponseEntity<>("", HttpStatus.OK); return new ResponseEntity<>(id, HttpStatus.OK);
} catch (IOException | ApiException | TypeExeption | TimeoutException | InterruptedException ex) { } catch (IOException | ApiException | TypeExeption | TimeoutException | InterruptedException ex) {
java.util.logging.Logger.getLogger(ToscaTemplateApiController.class.getName()).log(Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(ToscaTemplateApiController.class.getName()).log(Level.SEVERE, null, ex);
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
......
...@@ -67,8 +67,8 @@ public class DRIPService { ...@@ -67,8 +67,8 @@ public class DRIPService {
message.setToscaTemplate(toscaTemplate); message.setToscaTemplate(toscaTemplate);
caller.setRequestQeueName(requestQeueName); caller.setRequestQeueName(requestQeueName);
Message plannerResponse = caller.call(message); Message response = caller.call(message);
ToscaTemplate updatedToscaTemplate = plannerResponse.getToscaTemplate(); ToscaTemplate updatedToscaTemplate = response.getToscaTemplate();
caller.close(); caller.close();
return toscaTemplateService.save(updatedToscaTemplate); return toscaTemplateService.save(updatedToscaTemplate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment