From 540ea061d14bf36b8de41bd75fac74ea7e40c8ab Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Apr 2021 10:09:14 +0200 Subject: [PATCH 1/3] Increase default number of web workers to 4 to solve federation issues --- deploy/env.prod.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample index cb567e20d..5937e7741 100644 --- a/deploy/env.prod.sample +++ b/deploy/env.prod.sample @@ -36,7 +36,7 @@ FUNKWHALE_API_IP=127.0.0.1 FUNKWHALE_API_PORT=5000 # The number of web workers to start in parallel. Higher means you can handle # more concurrent requests, but also leads to higher CPU/Memory usage -FUNKWHALE_WEB_WORKERS=1 +FUNKWHALE_WEB_WORKERS=4 # Replace this by the definitive, public domain you will use for # your instance. It cannot be changed after initial deployment # without breaking your instance. From 1f80f30a1279a4e5c7f17a8d327766b194f542c7 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Apr 2021 11:29:59 +0200 Subject: [PATCH 2/3] Add changelog snippet --- changes/changelog.d/1303.Bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/changelog.d/1303.Bugfix diff --git a/changes/changelog.d/1303.Bugfix b/changes/changelog.d/1303.Bugfix new file mode 100644 index 000000000..9a77c1865 --- /dev/null +++ b/changes/changelog.d/1303.Bugfix @@ -0,0 +1 @@ +Fix federation issues by increasing FUNKWHALE_WEB_WORKERS (#1303) From a6b63bb5ee48b32be07a9d407cc9c9bc6478eedf Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Apr 2021 11:31:47 +0200 Subject: [PATCH 3/3] Update changelog snippet --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 83ff1b051..07dcdfd83 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -361,7 +361,7 @@ Here is a shortcut you can use/adapt to easily create new fragments from command issue="42" content="Fixed an overflowing issue on small resolutions (#$issue)" category="bugfix" - echo $content > changes/changelog.d/$issue.$category + echo "$content ($issue)" > changes/changelog.d/$issue.$category You can of course create fragments by hand in your text editor, or from Gitlab's interface as well.