Merge pull request #159 from AuthMe-Team/master

FIxed CP property
This commit is contained in:
Alexandre Vanhecke 2015-07-31 23:42:49 +02:00
commit 1296c535bd
4 changed files with 14 additions and 4 deletions

View File

@ -9,7 +9,7 @@
- Build status (CircleCI): [![Circle CI](https://circleci.com/gh/Xephi/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/Xephi/AuthMeReloaded)
- Build Server (<strong>DEVELOPMENT BUILDS</strong>): <a href="http://ci.xephi.fr">Xephi's Jenkins</a>
- Build Server (<strong>DEVELOPMENT BUILDS</strong>): <a href="http://ci.xephi.fr/job/AuthMeReloaded">Xephi's Jenkins</a>
- JavaDocs: <a href="http://xephi.github.io/AuthMeReloaded/index.html">AuthMe Javadoc</a>

View File

@ -110,6 +110,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.versioneye</groupId>
<artifactId>versioneye-maven-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<projectId>55bab9e8653762002000190a</projectId>
<!--<apiKey>my_secret_api_key</apiKey>-->>
</configuration>
</plugin>
</plugins>
</build>

View File

@ -121,7 +121,7 @@ public class MySQL implements DataSource {
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
config.addDataSourceProperty("autoReconnect", true);
config.addDataSourceProperty("initializationFailFast", true);
config.setInitializationFailFast(false);
ds = new HikariDataSource(config);
ConsoleLogger.info("Connection pool ready");
}
@ -912,7 +912,7 @@ public class MySQL implements DataSource {
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
config.addDataSourceProperty("autoReconnect", true);
config.addDataSourceProperty("initializationFailFast", true);
config.setInitializationFailFast(false);
config.setPoolName("AuthMeMYSQLPool");
ds = new HikariDataSource(config);
if (!reload)

View File

@ -2,7 +2,8 @@ AuthMe-Team:
Xephi (Xephi59) - Leader, Main developer
darkwarriors (d4rkwarriors) - Old AuthMe Reloaded Author
Kloudy - Main developer
Kloudy - Developer
Gnat008 - Developer
Gabriele C. (sgdc3) - Ticket Manager, Project Page and Structure Manager, Contributor
Maxetto - Ticket Manager, Italian Translator, Basic Developer, Contributor
Trojaner25 - Ticket manager, Basic Developer