From e1d76738da848c2ccdc5f99e2763b5816bc2685e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 5 Aug 2020 22:07:04 +0100
Subject: [PATCH] Merge Synapse::ViaHaproxy and -I Synapse::Dendron

Dendron is no longer a thing, which means it no longer makes sense to run
synapse workers without an haproxy. We may as well merge the classes.
---
 lib/SyTest/Homeserver/Synapse.pm        | 45 +++++--------------------
 lib/SyTest/HomeserverFactory/Synapse.pm | 16 ++-------
 2 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm
index 36e1e115e..69991a23d 100644
--- a/lib/SyTest/Homeserver/Synapse.pm
+++ b/lib/SyTest/Homeserver/Synapse.pm
@@ -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
 {
@@ -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
@@ -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
@@ -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;
diff --git a/lib/SyTest/HomeserverFactory/Synapse.pm b/lib/SyTest/HomeserverFactory/Synapse.pm
index 49a75c7af..a5072906a 100644
--- a/lib/SyTest/HomeserverFactory/Synapse.pm
+++ b/lib/SyTest/HomeserverFactory/Synapse.pm
@@ -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} = "";
 }
@@ -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;