Browse Source

Merge branch 'gun-pool-fix' into 'develop'

Fix for gun connections pool

Closes #1669 and #1664

See merge request pleroma/pleroma!2356
contrib/munin-healthcheck
feld 4 years ago
parent
commit
90cbf55236
2 changed files with 6 additions and 1 deletions
  1. +3
    -0
      CHANGELOG.md
  2. +3
    -1
      lib/pleroma/gun/conn.ex

+ 3
- 0
CHANGELOG.md View File

@@ -20,6 +20,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mastodon API: Support for `include_types` in `/api/v1/notifications`.
</details>

### Fixed
- Gun connections pool `max_connections` option.

## [2.0.0] - 2019-03-08
### Security
- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.


+ 3
- 1
lib/pleroma/gun/conn.ex View File

@@ -49,8 +49,10 @@ defmodule Pleroma.Gun.Conn do

key = "#{uri.scheme}:#{uri.host}:#{uri.port}"

max_connections = pool_opts[:max_connections] || 250

conn_pid =
if Connections.count(name) < opts[:max_connection] do
if Connections.count(name) < max_connections do
do_open(uri, opts)
else
close_least_used_and_do_open(name, uri, opts)


Loading…
Cancel
Save