Skip to content

Commit

Permalink
Transition worker_replication_* settings to instance_map->main settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@realtyem
realtyem committed Jul 2, 2023
1 parent 0fc46a4 commit 8585924
Showing 1 changed file with 4 additions and 28 deletions.
32 changes: 4 additions & 28 deletions lib/SyTest/Homeserver/Synapse.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ sub start
) : (),

instance_map => {
"main" => {
host => "$bind_host",
port => $self->{ports}{synapse_unsecure},
},
"event_persister1" => {
host => "$bind_host",
port => $self->{ports}{event_persister1},
Expand Down Expand Up @@ -670,8 +674,6 @@ sub _start_synapse
"worker_name" => "pusher",
"worker_pid_file" => "$hsdir/pusher.pid",
"worker_log_config" => $self->configure_logger("pusher"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand All @@ -696,8 +698,6 @@ sub _start_synapse
"worker_name" => "appservice",
"worker_pid_file" => "$hsdir/appservice.pid",
"worker_log_config" => $self->configure_logger("appservice"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "manhole",
Expand All @@ -722,8 +722,6 @@ sub _start_synapse
"worker_name" => "federation_sender",
"worker_pid_file" => "$hsdir/federation_sender.pid",
"worker_log_config" => $self->configure_logger("federation_sender"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "manhole",
Expand All @@ -748,8 +746,6 @@ sub _start_synapse
"worker_name" => "synchrotron",
"worker_pid_file" => "$hsdir/synchrotron.pid",
"worker_log_config" => $self->configure_logger("synchrotron"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -780,8 +776,6 @@ sub _start_synapse
"worker_name" => "federation_reader",
"worker_pid_file" => "$hsdir/federation_reader.pid",
"worker_log_config" => $self->configure_logger("federation_reader"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -812,8 +806,6 @@ sub _start_synapse
"worker_name" => "media_repository",
"worker_pid_file" => "$hsdir/media_repository.pid",
"worker_log_config" => $self->configure_logger("media_repository"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -844,8 +836,6 @@ sub _start_synapse
"worker_name" => "client_reader",
"worker_pid_file" => "$hsdir/client_reader.pid",
"worker_log_config" => $self->configure_logger("client_reader"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -876,8 +866,6 @@ sub _start_synapse
"worker_name" => "user_dir",
"worker_pid_file" => "$hsdir/user_dir.pid",
"worker_log_config" => $self->configure_logger("user_dir"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -908,8 +896,6 @@ sub _start_synapse
"worker_name" => "event_creator",
"worker_pid_file" => "$hsdir/event_creator.pid",
"worker_log_config" => $self->configure_logger("event_creator"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -940,8 +926,6 @@ sub _start_synapse
"worker_name" => "frontend_proxy1",
"worker_pid_file" => "$hsdir/frontend_proxy.pid",
"worker_log_config" => $self->configure_logger("frontend_proxy"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -972,8 +956,6 @@ sub _start_synapse
"worker_name" => "background_worker1",
"worker_pid_file" => "$hsdir/background_worker.pid",
"worker_log_config" => $self->configure_logger("background_worker"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
};

push @worker_configs, $background_worker_config;
Expand All @@ -985,8 +967,6 @@ sub _start_synapse
"worker_name" => "event_persister1",
"worker_pid_file" => "$hsdir/event_persister1.pid",
"worker_log_config" => $self->configure_logger("event_persister1"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -1017,8 +997,6 @@ sub _start_synapse
"worker_name" => "event_persister2",
"worker_pid_file" => "$hsdir/event_persister2.pid",
"worker_log_config" => $self->configure_logger("event_persister2"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down Expand Up @@ -1049,8 +1027,6 @@ sub _start_synapse
"worker_name" => "stream_writer",
"worker_pid_file" => "$hsdir/stream_writer.pid",
"worker_log_config" => $self->configure_logger("stream_writer"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_listeners" => [
{
type => "http",
Expand Down

0 comments on commit 8585924

Please sign in to comment.