Skip to content

Merge Synapse::ViaHaproxy and -I Synapse::Dendron #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richvdh merged 1 commit into from
Aug 6, 2020
Merged

Merge Synapse::ViaHaproxy and -I Synapse::Dendron #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 9 additions & 36 deletions lib/SyTest/Homeserver/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,13 @@ sub _start_await_port
return $self->{ports}{synapse};
}

package SyTest::Homeserver::Synapse::ViaDendron;
package SyTest::Homeserver::Synapse::ViaHaproxy;
use base qw( SyTest::Homeserver::Synapse );

use Carp;
use File::Slurper qw( read_binary );

use constant HAPROXY_BIN => $ENV{HAPROXY_BIN} // "/usr/sbin/haproxy";

sub _init
{
Expand All @@ -689,6 +692,9 @@ sub _init

my $idx = $self->{hs_index};
$self->{ports}{dendron} = main::alloc_port( "dendron[$idx]" );

defined $self->{ports}{$_} or croak "Need a '$_' port\n"
for qw( haproxy );
}

sub _check_db_config
Expand Down Expand Up @@ -1052,34 +1058,13 @@ sub _start_await_port
sub secure_port
{
my $self = shift;
return $self->{ports}{dendron};
return $self->{ports}{haproxy};
}

sub unsecure_port
{
my $self = shift;
die "dendron does not have an unsecure port mode\n";
}

package SyTest::Homeserver::Synapse::ViaHaproxy;
# For now we'll base this on "ViaDendron" so that dendron manages the multiple
# workers. Longer-term we'll want to have a specific worker management system
# so we can avoid dendron itself.
use base qw( SyTest::Homeserver::Synapse::ViaDendron );

use Carp;

use File::Slurper qw( read_binary );

use constant HAPROXY_BIN => $ENV{HAPROXY_BIN} // "/usr/sbin/haproxy";

sub _init
{
my $self = shift;
$self->SUPER::_init( @_ );

defined $self->{ports}{$_} or croak "Need a '$_' port\n"
for qw( haproxy );
die "haproxy does not have an unsecure port mode\n";
}

sub start
Expand Down Expand Up @@ -1263,16 +1248,4 @@ sub generate_haproxy_get_map
EOCONFIG
}

sub secure_port
{
my $self = shift;
return $self->{ports}{haproxy};
}

sub unsecure_port
{
my $self = shift;
die "haproxy does not have an unsecure port mode\n";
}

1;
16 changes: 2 additions & 14 deletions lib/SyTest/HomeserverFactory/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,14 @@ sub create_server
}


package SyTest::HomeserverFactory::Synapse::ViaDendron;
package SyTest::HomeserverFactory::Synapse::ViaHaproxy;
use base qw( SyTest::HomeserverFactory::Synapse );

sub _init
{
my $self = shift;
$self->SUPER::_init( @_ );
$self->{impl} = "SyTest::Homeserver::Synapse::ViaDendron";
$self->{args}{dendron_binary} = "";
$self->{impl} = "SyTest::Homeserver::Synapse::ViaHaproxy";
$self->{args}{torture_replication} = 0;
$self->{args}{redis_host} = "";
}
Expand Down Expand Up @@ -132,15 +131,4 @@ sub print_usage
EOF
}


package SyTest::HomeserverFactory::Synapse::ViaHaproxy;
use base qw( SyTest::HomeserverFactory::Synapse::ViaDendron );

sub _init
{
my $self = shift;
$self->SUPER::_init( @_ );
$self->{impl} = "SyTest::Homeserver::Synapse::ViaHaproxy";
}

1;