Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Add missing type definitions for scripts in docker folder (#12280)
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Florian <jafn28@gmail.com>
  • Loading branch information
watson28 authored Apr 8, 2022
1 parent 7732c49 commit 78e4d96
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions changelog.d/12280.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add missing type definitions for scripts in docker folder. Contributed by Jorge Florian.
9 changes: 5 additions & 4 deletions docker/configure_workers_and_start.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
import os
import subprocess
import sys
from typing import Any, Dict, Set

import jinja2
import yaml

MAIN_PROCESS_HTTP_LISTENER_PORT = 8080


WORKERS_CONFIG = {
WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
"pusher": {
"app": "synapse.app.pusher",
"listener_resources": [],
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ local_partial_types = True
no_implicit_optional = True

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

0 comments on commit 78e4d96

Please sign in to comment.