Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 930-captcha-for-register

2017-12-22 21:54:58 +01:00
parent 1a60036592 c1f3fcd393
commit c8d82a23e0
20 changed files with 194 additions and 88 deletions
@@ -123,9 +123,9 @@ public final class DatabaseSettings implements SettingsHolder {
    public static final Property<String> MYSQL_COL_GROUP =
        newProperty("ExternalBoardOptions.mySQLColumnGroup", "");

-    @Comment("Overrides the size of the DB Connection Pool, -1 = Auto")
+    @Comment("Overrides the size of the DB Connection Pool, default = 10")
    public static final Property<Integer> MYSQL_POOL_SIZE =
-        newProperty("DataSource.poolSize", -1);
+        newProperty("DataSource.poolSize", 10);

    @Comment({"The maximum lifetime of a connection in the pool, default = 1800 seconds",
        "You should set this at least 30 seconds less than mysql server wait_timeout"})