fix: incorrect logic for error handling (#72)

gaukas · web-flow · commit 897924634265 · 2024-06-24T11:24:08.000-06:00
Signed-off-by: Gaukas Wang &lt;i@gaukas.wang&gt;
diff --git a/core.go b/core.go
@@ -392,14 +392,16 @@ func (c *core) Instantiate() (err error) {
 		memFS := memfs.New()
 
 		err := memFS.WriteFile("watm.cfg", c.config.TransportModuleConfig.AsBytes())
-		if errors.Is(err, nil) || errors.Is(err, sys.Errno(0)) {
+		if !errors.Is(err, nil) && !errors.Is(err, sys.Errno(0)) {
 			return fmt.Errorf("water: memFS.WriteFile returned error: %w", err)
 		}
 
 		if expFsCfg, ok := fsCfg.(expsysfs.FSConfig); ok {
 			fsCfg = expFsCfg.WithSysFSMount(memFS, "/conf/")
 			mc.SetFSConfig(fsCfg)
 		}
+	} else {
+		log.LWarnf(c.config.Logger(), "water: TransportModuleConfig is not set, skipping...")
 	}
 
 	if c.instance, err = c.runtime.InstantiateModule(

Original file line number	Diff line number	Diff line change
`@@ -392,14 +392,16 @@ func (c *core) Instantiate() (err error) {`
`392`	`392`	`memFS := memfs.New()`
`393`	`393`
`394`	`394`	`err := memFS.WriteFile("watm.cfg", c.config.TransportModuleConfig.AsBytes())`
`395`		`- if errors.Is(err, nil) \|\| errors.Is(err, sys.Errno(0)) {`
	`395`	`+ if !errors.Is(err, nil) && !errors.Is(err, sys.Errno(0)) {`
`396`	`396`	`return fmt.Errorf("water: memFS.WriteFile returned error: %w", err)`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`if expFsCfg, ok := fsCfg.(expsysfs.FSConfig); ok {`
`400`	`400`	`fsCfg = expFsCfg.WithSysFSMount(memFS, "/conf/")`
`401`	`401`	`mc.SetFSConfig(fsCfg)`
`402`	`402`	`}`
	`403`	`+ } else {`
	`404`	`+ log.LWarnf(c.config.Logger(), "water: TransportModuleConfig is not set, skipping...")`
`403`	`405`	`}`
`404`	`406`
`405`	`407`	`if c.instance, err = c.runtime.InstantiateModule(`