Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Philippe Caseiro 2018-06-21 13:46:21 +02:00
commit ed910e72ee
2 changed files with 9 additions and 0 deletions

View File

@ -97,6 +97,12 @@
<variable name="dbMaxAllowedPacket" type='number' description="Taille maximum d'un paquet (en Mo)"> <variable name="dbMaxAllowedPacket" type='number' description="Taille maximum d'un paquet (en Mo)">
<value>32</value> <value>32</value>
</variable> </variable>
<variable name='dbWaitTimeout' type='number' description="Nombre de secondes d'attente avant de fermer la connection">
<value>28800</value>
</variable>
<variable name='dbInteractiveTimeout' type='number' description="Nombre de secondes d'attente avant de fermer la connection en mode interactif">
<value>28800</value>
</variable>
</family> </family>
<family name="Database Cluster"> <family name="Database Cluster">

View File

@ -17,6 +17,9 @@ tmp_table_size = %%dbTmpTableSize
max_heap_table_size = %%dbTmpTableSize max_heap_table_size = %%dbTmpTableSize
max_allowed_packet = %%{dbMaxAllowedPacket}M max_allowed_packet = %%{dbMaxAllowedPacket}M
wait_timeout = %%{dbWaitTimeout}
interactive_timeout = %%{dbInteractiveTimeout}
%if %%dbEnableSlowQueryLogs == "oui" %if %%dbEnableSlowQueryLogs == "oui"
slow-query-log = 1 slow-query-log = 1
slow-query-log-file = %%getVar('dbSlowQueryLogFile') slow-query-log-file = %%getVar('dbSlowQueryLogFile')