mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

refresh dendrite main

Browse source
This commit is contained in:
Tak Wai Wong 2022-03-10 10:22:39 -08:00
parent 3c0185d610
commit 7a403ce839
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/docker/config/dendrite.yaml
View file

@ -312,6 +312,7 @@ user_api:
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
<<<<<<< HEAD
# Configuration for the Push Server API. # Configuration for the Push Server API.
push_server: push_server:
@ -323,6 +324,8 @@ push_server:
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
=======
>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
# Configuration for the Push Server API. # Configuration for the Push Server API.
push_server: push_server:

3
setup/config/config_test.go
View file

@ -200,11 +200,14 @@ user_api:
max_open_conns: 100 max_open_conns: 100
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
<<<<<<< HEAD
pusher_database: pusher_database:
connection_string: file:pushserver.db connection_string: file:pushserver.db
max_open_conns: 100 max_open_conns: 100
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
=======
>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
pusher_database: pusher_database:
connection_string: file:pushserver.db connection_string: file:pushserver.db
max_open_conns: 100 max_open_conns: 100