瀏覽代碼

Add missing type definitions for scripts in docker folder (#12280)

Signed-off-by: Jorge Florian <jafn28@gmail.com>
tags/v1.57.0rc1
Jorge Florian 2 年之前
committed by GitHub
父節點
當前提交
78e4d96a4d
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. +1
    -0
      changelog.d/12280.misc
  2. +5
    -4
      docker/configure_workers_and_start.py
  3. +1
    -0
      mypy.ini

+ 1
- 0
changelog.d/12280.misc 查看文件

@@ -0,0 +1 @@
Add missing type definitions for scripts in docker folder. Contributed by Jorge Florian.

+ 5
- 4
docker/configure_workers_and_start.py 查看文件

@@ -29,6 +29,7 @@
import os
import subprocess
import sys
from typing import Any, Dict, Set

import jinja2
import yaml
@@ -36,7 +37,7 @@ import yaml
MAIN_PROCESS_HTTP_LISTENER_PORT = 8080


WORKERS_CONFIG = {
WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
"pusher": {
"app": "synapse.app.pusher",
"listener_resources": [],
@@ -355,7 +356,7 @@ def generate_worker_files(environ, config_path: str, data_dir: str):
# worker_type: {1234, 1235, ...}}
# }
# and will be used to construct 'upstream' nginx directives.
nginx_upstreams = {}
nginx_upstreams: Dict[str, Set[int]] = {}

# A map of: {"endpoint": "upstream"}, where "upstream" is a str representing what will be
# placed after the proxy_pass directive. The main benefit to representing this data as a
@@ -384,7 +385,7 @@ def generate_worker_files(environ, config_path: str, data_dir: str):
# A counter of worker_type -> int. Used for determining the name for a given
# worker type when generating its config file, as each worker's name is just
# worker_type + instance #
worker_type_counter = {}
worker_type_counter: Dict[str, int] = {}

# For each worker type specified by the user, create config values
for worker_type in worker_types:
@@ -404,7 +405,7 @@ def generate_worker_files(environ, config_path: str, data_dir: str):
# e.g. federation_reader1
worker_name = worker_type + str(new_worker_count)
worker_config.update(
{"name": worker_name, "port": worker_port, "config_path": config_path}
{"name": worker_name, "port": str(worker_port), "config_path": config_path}
)

# Update the shared config with any worker-type specific options


+ 1
- 0
mypy.ini 查看文件

@@ -11,6 +11,7 @@ local_partial_types = True
no_implicit_optional = True

files =
docker/,
scripts-dev/,
setup.py,
synapse/,


Loading…
取消
儲存