diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go index bf8cc984a..f21cb107e 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go @@ -25,11 +25,9 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "AppServiceAPI") - defer base.Close() // nolint: errcheck + accountDB := base.CreateAccountsDB() deviceDB := base.CreateDeviceDB() federation := base.CreateFederationClient() diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go index e42f7667c..d34890bb3 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go @@ -26,8 +26,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "ClientAPI") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go index 0f69a04a6..b5551af94 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go @@ -25,8 +25,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "FederationAPI") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go index f092c5492..5aead3178 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go @@ -24,8 +24,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "FederationSender") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go index b089a31d4..54d22f25e 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go @@ -24,8 +24,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "MediaAPI") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go index ea94bba81..6d865d385 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go @@ -46,8 +46,6 @@ func main() { cfg := basecomponent.ParseMonolithFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "Monolith") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go index f53333373..a3d3ae01e 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go @@ -24,8 +24,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "PublicRoomsAPI") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go index b3e047311..72b40a616 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go @@ -26,8 +26,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "RoomServerAPI") defer base.Close() // nolint: errcheck diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go index 53bcdeb3c..80cefcaa3 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go @@ -24,8 +24,6 @@ func main() { cfg := basecomponent.ParseFlags() tracers := common.NewTracers(cfg) - defer tracers.Close() // nolint: errcheck - base := basecomponent.NewBaseDendrite(cfg, tracers, "SyncAPI") defer base.Close() // nolint: errcheck