This commit is contained in:
clokep 2023-05-23 13:06:36 +00:00
parent 04b9e8bec2
commit ad0e0fe8cf
4 changed files with 16 additions and 12 deletions

View File

@ -1781,15 +1781,17 @@ dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
</ul> </ul>
<h1 id="upgrading-to-v1840"><a class="header" href="#upgrading-to-v1840">Upgrading to v1.84.0</a></h1> <h1 id="upgrading-to-v1840"><a class="header" href="#upgrading-to-v1840">Upgrading to v1.84.0</a></h1>
<h2 id="deprecation-of-worker_replication_-configuration-settings"><a class="header" href="#deprecation-of-worker_replication_-configuration-settings">Deprecation of <code>worker_replication_*</code> configuration settings</a></h2> <h2 id="deprecation-of-worker_replication_-configuration-settings"><a class="header" href="#deprecation-of-worker_replication_-configuration-settings">Deprecation of <code>worker_replication_*</code> configuration settings</a></h2>
<p>When using workers, </p> <p>When using workers,</p>
<ul> <ul>
<li><code>worker_replication_host</code></li> <li><code>worker_replication_host</code></li>
<li><code>worker_replication_http_port</code></li> <li><code>worker_replication_http_port</code></li>
<li><code>worker_replication_http_tls</code></li> <li><code>worker_replication_http_tls</code></li>
</ul> </ul>
<p>can now be removed from individual worker YAML configuration <em><strong>if</strong></em> you add the main process to the <code>instance_map</code> in the shared YAML configuration, <p>should now be removed from individual worker YAML configurations and the main process should instead be added to the <code>instance_map</code>
using the name <code>main</code>.</p> in the shared YAML configuration, using the name <code>main</code>.</p>
<h3 id="before"><a class="header" href="#before">Before:</a></h3> <p>The old <code>worker_replication_*</code> settings are now considered deprecated and are expected to be removed in Synapse v1.88.0.</p>
<h3 id="example-change"><a class="header" href="#example-change">Example change</a></h3>
<h4 id="before"><a class="header" href="#before">Before:</a></h4>
<p>Shared YAML</p> <p>Shared YAML</p>
<pre><code class="language-yaml">instance_map: <pre><code class="language-yaml">instance_map:
generic_worker1: generic_worker1:
@ -1817,7 +1819,7 @@ worker_listeners:
worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml
</code></pre> </code></pre>
<h3 id="after"><a class="header" href="#after">After:</a></h3> <h4 id="after"><a class="header" href="#after">After:</a></h4>
<p>Shared YAML</p> <p>Shared YAML</p>
<pre><code class="language-yaml">instance_map: <pre><code class="language-yaml">instance_map:
main: main:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -233,15 +233,17 @@ dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
</ul> </ul>
<h1 id="upgrading-to-v1840"><a class="header" href="#upgrading-to-v1840">Upgrading to v1.84.0</a></h1> <h1 id="upgrading-to-v1840"><a class="header" href="#upgrading-to-v1840">Upgrading to v1.84.0</a></h1>
<h2 id="deprecation-of-worker_replication_-configuration-settings"><a class="header" href="#deprecation-of-worker_replication_-configuration-settings">Deprecation of <code>worker_replication_*</code> configuration settings</a></h2> <h2 id="deprecation-of-worker_replication_-configuration-settings"><a class="header" href="#deprecation-of-worker_replication_-configuration-settings">Deprecation of <code>worker_replication_*</code> configuration settings</a></h2>
<p>When using workers, </p> <p>When using workers,</p>
<ul> <ul>
<li><code>worker_replication_host</code></li> <li><code>worker_replication_host</code></li>
<li><code>worker_replication_http_port</code></li> <li><code>worker_replication_http_port</code></li>
<li><code>worker_replication_http_tls</code></li> <li><code>worker_replication_http_tls</code></li>
</ul> </ul>
<p>can now be removed from individual worker YAML configuration <em><strong>if</strong></em> you add the main process to the <code>instance_map</code> in the shared YAML configuration, <p>should now be removed from individual worker YAML configurations and the main process should instead be added to the <code>instance_map</code>
using the name <code>main</code>.</p> in the shared YAML configuration, using the name <code>main</code>.</p>
<h3 id="before"><a class="header" href="#before">Before:</a></h3> <p>The old <code>worker_replication_*</code> settings are now considered deprecated and are expected to be removed in Synapse v1.88.0.</p>
<h3 id="example-change"><a class="header" href="#example-change">Example change</a></h3>
<h4 id="before"><a class="header" href="#before">Before:</a></h4>
<p>Shared YAML</p> <p>Shared YAML</p>
<pre><code class="language-yaml">instance_map: <pre><code class="language-yaml">instance_map:
generic_worker1: generic_worker1:
@ -269,7 +271,7 @@ worker_listeners:
worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml
</code></pre> </code></pre>
<h3 id="after"><a class="header" href="#after">After:</a></h3> <h4 id="after"><a class="header" href="#after">After:</a></h4>
<p>Shared YAML</p> <p>Shared YAML</p>
<pre><code class="language-yaml">instance_map: <pre><code class="language-yaml">instance_map:
main: main: