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

This commit is contained in:
Philippe Caseiro 2018-06-21 10:05:54 +02:00
commit fd85a16b20
2 changed files with 7 additions and 0 deletions

View File

@ -93,6 +93,9 @@
<variable name='rdCliOutBuffSoftLimit' type='number' description="Client output buffer soft limit (for slave)"> <variable name='rdCliOutBuffSoftLimit' type='number' description="Client output buffer soft limit (for slave)">
<value>256</value> <value>256</value>
</variable> </variable>
<variable name='%%rdSaveDisable' type='oui/non' description="Désactiver la presistence des données sur les maitres">
<value>non</value>
</variable>
</family> </family>
<separators> <separators>
<separator name='redisInstanceName'>Instance Principale</separator> <separator name='redisInstanceName'>Instance Principale</separator>

View File

@ -199,9 +199,13 @@ databases 16
# #
# save "" # save ""
%if %%rdSaveDisable == 'oui'
save ""
%else
save 900 1 save 900 1
save 300 10 save 300 10
save 60 10000 save 60 10000
%end if
# By default Redis will stop accepting writes if RDB snapshots are enabled # By default Redis will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed. # (at least one save point) and the latest background save failed.