Skip to content
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

Added recommended setting validation_query_timeout to dbconfig.xml #18

Merged
merged 4 commits into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).

## [Unreleased](https://github.com/idealista/jira_role/tree/develop)
- [#20](https://github.com/idealista/jira_role/issues/20) *Added recommended setting validation_query_timeout to dbconfig.xml* @mmolinac

## [1.1.0](https://github.com/idealista/jira_role/tree/1.1.0)
[Full Changelog](https://github.com/idealista/jira_role/compare/1.0.2...1.1.0)
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
- src: idealista.java_role
version: 3.3.0
version: 3.4.2
mmolinac marked this conversation as resolved.
Show resolved Hide resolved
name: java_role
1 change: 1 addition & 0 deletions templates/conf/dbconfig.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<pool-max-size>20</pool-max-size>
<pool-max-wait>30000</pool-max-wait>
<validation-query>{{ jira_database_validation_query }}</validation-query>
<validation-query-timeout>{{ jira_database_validation_query_timeout }}</validation-query-timeout>
<min-evictable-idle-time-millis>60000</min-evictable-idle-time-millis>
<time-between-eviction-runs-millis>300000</time-between-eviction-runs-millis>
<pool-max-idle>20</pool-max-idle>
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
- src: idealista.java-role
version: 3.3.0
version: 3.4.2
name: java
1 change: 1 addition & 0 deletions vars/mysql-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ jira_mysql_repo: "deb {{ jira_mysql_repo_url }} {{ ansible_distribution_release
jira_database_url: "jdbc:mysql://{{ jira_database_host }}:{{ jira_database_port }}/{{ jira_database_name }}?useUnicode=true&amp;characterEncoding=UTF8&amp;sessionVariables=default_storage_engine=InnoDB"
jira_database_driver_class: 'com.mysql.jdbc.Driver'
jira_database_validation_query: 'select 1'
jira_database_validation_query_timeout: 3
1 change: 1 addition & 0 deletions vars/oracle-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
jira_database_url: "jdbc:oracle:thin:@(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = {{ jira_database_host }})(PORT = {{ jira_database_port }})))(CONNECT_DATA = (SERVICE_NAME = {{ jira_database_service_name }})(SERVER = DEDICATED)))"
jira_database_driver_class: 'oracle.jdbc.OracleDriver'
jira_database_validation_query: 'select 1 from dual'
jira_database_validation_query_timeout: 3
1 change: 1 addition & 0 deletions vars/oracle10g-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
jira_database_url: "jdbc:oracle:thin:@(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = {{ jira_database_host }})(PORT = {{ jira_database_port }})))(CONNECT_DATA = (SERVICE_NAME = {{ jira_database_service_name }})(SERVER = DEDICATED)))"
jira_database_driver_class: 'oracle.jdbc.OracleDriver'
jira_database_validation_query: 'select 1 from dual'
jira_database_validation_query_timeout: 3