NoListener

cmd/dendrite-appservice-server/main.go

@@ -31,8 +31,8 @@ func main() {
 	appservice.AddInternalRoutes(base.InternalAPIMux, intAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.AppServiceAPI.InternalAPI.Listen,
+		base.Cfg.AppServiceAPI.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener, // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-edu-server/main.go

@@ -34,8 +34,8 @@ func main() {
 	eduserver.AddInternalRoutes(base.InternalAPIMux, intAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.EDUServer.InternalAPI.Listen,
+		base.Cfg.EDUServer.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener,                      // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-federation-sender-server/main.go

@@ -36,8 +36,8 @@ func main() {
 	federationsender.AddInternalRoutes(base.InternalAPIMux, fsAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.FederationSender.InternalAPI.Listen,
+		base.Cfg.FederationSender.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener, // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-key-server/main.go

@@ -30,8 +30,8 @@ func main() {
 	keyserver.AddInternalRoutes(base.InternalAPIMux, intAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.KeyServer.InternalAPI.Listen,
+		base.Cfg.KeyServer.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener,                      // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-monolith-server/main.go

@@ -162,9 +162,9 @@ func main() {
 	if *certFile != "" && *keyFile != "" {
 		go func() {
 			base.SetupAndServeHTTP(
-				setup.NoInternalListener, // internal API
+				setup.NoListener,  // internal API
-				httpsAddr,                // external API
+				httpsAddr,         // external API
-				certFile, keyFile,        // TLS settings
+				certFile, keyFile, // TLS settings
 			)
 		}()
 	}

cmd/dendrite-room-server/main.go

@@ -33,8 +33,8 @@ func main() {
 	roomserver.AddInternalRoutes(base.InternalAPIMux, rsAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.RoomServer.InternalAPI.Listen,
+		base.Cfg.RoomServer.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener,                       // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-server-key-api-server/main.go

@@ -30,8 +30,8 @@ func main() {
 	serverkeyapi.AddInternalRoutes(base.InternalAPIMux, intAPI, base.Caches)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.ServerKeyAPI.InternalAPI.Listen,
+		base.Cfg.ServerKeyAPI.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener,                         // external listener
 		nil, nil,
 	)
 }

cmd/dendrite-user-api-server/main.go

@@ -31,8 +31,8 @@ func main() {
 	userapi.AddInternalRoutes(base.InternalAPIMux, userAPI)
 
 	base.SetupAndServeHTTP(
-		base.Cfg.UserAPI.InternalAPI.Listen,
+		base.Cfg.UserAPI.InternalAPI.Listen, // internal listener
-		setup.NoExternalListener,
+		setup.NoListener,                    // external listener
 		nil, nil,
 	)
 }

internal/setup/base.go

@@ -80,8 +80,7 @@ type BaseDendrite struct {
 const HTTPServerTimeout = time.Minute * 5
 const HTTPClientTimeout = time.Second * 30
 
-const NoInternalListener = ""
+const NoListener = ""
-const NoExternalListener = ""
 
 // NewBaseDendrite creates a new instance to be used by a component.
 // The componentName is used for logging purposes, and should be a friendly name
@@ -283,7 +282,7 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 	}
 	internalServ := externalServ
 
-	if internalAddr != NoInternalListener && externalAddr != internalAddr {
+	if internalAddr != NoListener && externalAddr != internalAddr {
 		internalRouter = mux.NewRouter().SkipClean(true).UseEncodedPath()
 		internalServ = &http.Server{
 			Addr:    string(internalAddr),
@@ -301,9 +300,9 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 	externalRouter.PathPrefix(httputil.PublicFederationPathPrefix).Handler(b.PublicFederationAPIMux)
 	externalRouter.PathPrefix(httputil.PublicMediaPathPrefix).Handler(b.PublicMediaAPIMux)
 
-	if internalAddr != NoInternalListener && internalAddr != externalAddr {
+	if internalAddr != NoListener && internalAddr != externalAddr {
 		go func() {
-			logrus.Infof("Starting %s listener on %s", b.componentName, internalServ.Addr)
+			logrus.Infof("Starting internal %s listener on %s", b.componentName, internalServ.Addr)
 			if certFile != nil && keyFile != nil {
 				if err := internalServ.ListenAndServeTLS(*certFile, *keyFile); err != nil {
 					logrus.WithError(err).Fatal("failed to serve HTTPS")
@@ -313,23 +312,25 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 					logrus.WithError(err).Fatal("failed to serve HTTP")
 				}
 			}
-			logrus.Infof("Stopped %s listener on %s", b.componentName, internalServ.Addr)
+			logrus.Infof("Stopped internal %s listener on %s", b.componentName, internalServ.Addr)
 		}()
 	}
 
-	go func() {
+	if externalAddr != NoListener {
-		logrus.Infof("Starting %s listener on %s", b.componentName, externalServ.Addr)
+		go func() {
-		if certFile != nil && keyFile != nil {
+			logrus.Infof("Starting external %s listener on %s", b.componentName, externalServ.Addr)
-			if err := externalServ.ListenAndServeTLS(*certFile, *keyFile); err != nil {
+			if certFile != nil && keyFile != nil {
-				logrus.WithError(err).Fatal("failed to serve HTTPS")
+				if err := externalServ.ListenAndServeTLS(*certFile, *keyFile); err != nil {
+					logrus.WithError(err).Fatal("failed to serve HTTPS")
+				}
+			} else {
+				if err := externalServ.ListenAndServe(); err != nil {
+					logrus.WithError(err).Fatal("failed to serve HTTP")
+				}
 			}
-		} else {
+			logrus.Infof("Stopped external %s listener on %s", b.componentName, externalServ.Addr)
-			if err := externalServ.ListenAndServe(); err != nil {
+		}()
-				logrus.WithError(err).Fatal("failed to serve HTTP")
+	}
-			}
-		}
-		logrus.Infof("Stopped %s listener on %s", b.componentName, externalServ.Addr)
-	}()
 
 	select {}
 }