[matrix] update worker and redis for Task#12025

matrix_extDB/matrix_noDB/synapse/federation_sender.log.yaml

@@ -0,0 +1,33 @@
+version: 1
+
+formatters:
+  fmt:
+    format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
+
+filters:
+  context:
+    (): synapse.logging.context.LoggingContextFilter
+    request: ""
+
+handlers:
+  console:
+    class: logging.StreamHandler
+    formatter: fmt
+    filters: [context]
+
+root:
+  level: INFO
+  handlers: [console] # to use file handler instead, switch to [file]
+
+loggers:
+  synapse:
+    level: INFO
+
+  synapse.storage.SQL:
+    level: INFO
+
+  ldap3:
+    level: INFO
+
+  ldap_auth_provider:
+    level: INFO

matrix_extDB/matrix_noDB/synapse/generic-worker-log.yaml

@@ -0,0 +1,33 @@
+version: 1
+
+formatters:
+  fmt:
+    format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
+
+filters:
+  context:
+    (): synapse.logging.context.LoggingContextFilter
+    request: ""
+
+handlers:
+  console:
+    class: logging.StreamHandler
+    formatter: fmt
+    filters: [context]
+
+root:
+  level: INFO
+  handlers: [console] # to use file handler instead, switch to [file]
+
+loggers:
+  synapse:
+    level: INFO
+
+  synapse.storage.SQL:
+    level: INFO
+
+  ldap3:
+    level: INFO
+
+  ldap_auth_provider:
+    level: INFO

matrix_extDB/matrix_noDB/synapse/homeserver.yaml.sh

@@ -286,11 +286,16 @@ listeners:
     tls: false
     type: http
     x_forwarded: true
-    bind_addresses: ['::', '0.0.0.0']
-
+    bind_addresses: ['::1', '127.0.0.1']
     resources:
       - names: [client, federation]
         compress: false
+  # The HTTP replication port
+  - port: 9093
+    bind_addresses: ['::1', '127.0.0.1']
+    type: http
+    resources:
+     - names: [replication]
 
     # example additional_resources:
     #
@@ -2870,8 +2875,8 @@ opentracing:
 # started, to ensure that all instances are running with the same config (otherwise
 # events may be dropped).
 #
-#federation_sender_instances:
-#  - federation_sender1
+federation_sender_instances:
+  - synapse-federation-sender-1
 
 # When using workers this should be a map from worker_name to the
 # HTTP replication listener of the worker, if configured.
@@ -2880,6 +2885,18 @@ opentracing:
 #  worker1:
 #    host: localhost
 #    port: 8034
+instance_map:
+  main:
+    host: 'localhost'
+    port: 9093
+  synapse-generic-worker-1:
+    host: 'localhost'
+    port: 8081
+    tls: false
+  synapse-federation-sender-1:
+    host: 'localhost'
+    port: 8082
+    tls: false
 
 # Experimental: When using workers you can define which workers should
 # handle event persistence and typing notifications. Any worker
@@ -2899,7 +2916,7 @@ opentracing:
 #
 # By default this is unused and traffic is not authenticated.
 #
-#worker_replication_secret: ""
+worker_replication_secret: "testtest#$"
 
 
 # Configuration for Redis when using workers. This *must* be enabled when
@@ -2908,13 +2925,13 @@ opentracing:
 redis:
   # Uncomment the below to enable Redis support.
   #
-  #enabled: true
+  enabled: true
 
   # Optional host and port to use to connect to redis. Defaults to
   # localhost and 6379
   #
-  #host: localhost
-  #port: 6379
+  host: $REDISHOST
+  port: $REDISPORT
 
   # Optional password if configured on the Redis instance
   #

matrix_extDB/matrix_noDB/synapse/workers/synapse-federation-sender-1.yaml

@@ -0,0 +1,15 @@
+worker_app: synapse.app.generic_worker
+worker_name: synapse-federation-sender-1
+
+worker_listeners:
+  - type: http
+    port: 8082
+    resources:
+      - names: [federation]
+  - type: http
+    port: 9082
+    resources:
+      - names: [replication]
+
+
+worker_log_config: /data/federation_sender.log.yaml

matrix_extDB/matrix_noDB/synapse/workers/synapse-generic-worker-1.yaml

@@ -0,0 +1,14 @@
+worker_app: synapse.app.generic_worker
+worker_name: synapse-generic-worker-1
+
+worker_listeners:
+  - type: http
+    port: 8081
+    resources:
+      - names: [client]
+  - type: http
+    port: 9081
+    resources:
+      - names: [replication]
+
+worker_log_config: /data/generic-worker-log.yaml