No panic on nwo cleanup (hyperledger-labs#1054)

mbrandenburger · web-flow · commit e466ed213993 · 2025-10-09T10:56:31.000+02:00
Signed-off-by: Marcus Brandenburger &lt;bur@zurich.ibm.com&gt;
diff --git a/integration/nwo/fsc/fsc.go b/integration/nwo/fsc/fsc.go
@@ -226,9 +226,9 @@ func (p *Platform) PreRun() {
 		}
 	}
 	logger.Infof("Starting DBs for following data sources: [%s]...", logging.Keys(configs))
-	close, err := postgres2.StartPostgresWithFmt(collections.Values(configs))
+	closeF, err := postgres2.StartPostgresWithFmt(collections.Values(configs))
 	gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to start dbs")
-	p.cleanDB = close
+	p.cleanDB = closeF
 }
 
 func (p *Platform) PostRun(bool) {
@@ -326,7 +326,10 @@ func (p *Platform) Cleanup() {
 	if p.metricsAggregatorProcess != nil {
 		p.metricsAggregatorProcess.Signal(os.Kill)
 	}
-	p.cleanDB()
+
+	if p.cleanDB != nil {
+		p.cleanDB()
+	}
 }
 
 func (p *Platform) CheckTopology() {

Original file line number	Diff line number	Diff line change
`@@ -226,9 +226,9 @@ func (p *Platform) PreRun() {`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`logger.Infof("Starting DBs for following data sources: [%s]...", logging.Keys(configs))`
`229`		`- close, err := postgres2.StartPostgresWithFmt(collections.Values(configs))`
	`229`	`+ closeF, err := postgres2.StartPostgresWithFmt(collections.Values(configs))`
`230`	`230`	`gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to start dbs")`
`231`		`- p.cleanDB = close`
	`231`	`+ p.cleanDB = closeF`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`func (p *Platform) PostRun(bool) {`
`@@ -326,7 +326,10 @@ func (p *Platform) Cleanup() {`
`326`	`326`	`if p.metricsAggregatorProcess != nil {`
`327`	`327`	`p.metricsAggregatorProcess.Signal(os.Kill)`
`328`	`328`	`}`
`329`		`- p.cleanDB()`
	`329`	`+`
	`330`	`+ if p.cleanDB != nil {`
	`331`	`+ p.cleanDB()`
	`332`	`+ }`
`330`	`333`	`}`
`331`	`334`
`332`	`335`	`func (p *Platform) CheckTopology() {`