diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index 8858a2eed..8ba1ce2f9 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -646,7 +646,7 @@ featured_apis=elasticSearchWarehouseV300 # -- Rest connector -------------------------------------------- # If Rest Connector do not get the response in the following seconds, it will throw the error message back. # This props can be omitted, the default value is 59. It should be less than Nginx timeout. -# rest_connector_method.timeout = 59 +# rest2019_connector_timeout = 59 diff --git a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala index 795be1012..68f1f2ce0 100644 --- a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala +++ b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala @@ -13,7 +13,7 @@ import scala.concurrent.Future object AkkaHttpClient extends MdcLoggable with CustomJsonFormats { - val httpRequestTimeout = APIUtil.getPropsAsIntValue("rest_connector_method.timeout").openOr(59) + val httpRequestTimeout = APIUtil.getPropsAsIntValue("rest2019_connector_timeout").openOr(59) /** * This function makes HttpRequest object according to the DB's data related to an account's webhook * @param uri In most cases it's a URL diff --git a/release_notes.md b/release_notes.md index 225a87a52..52a17a971 100644 --- a/release_notes.md +++ b/release_notes.md @@ -3,7 +3,7 @@ ### Most recent changes at top of file ``` Date Commit Action -08/11/2019 13d2e88a Added props: rest_connector_method.timeout. This set the timeout for all rest-connector methods. If connector do not get +08/11/2019 13d2e88a Added props: rest2019_connector_timeout. This set the timeout for all rest-connector methods. If connector do not get response by the specified seconds, then obp will throw the adapter timeout error. 07/11/2019 015d8420 Added props: webui_agree_privacy_policy_html_text makes this text on the sign up page /user_mgt/sign_up configurable. It has the default html format value.