v0.9.8 - server still works if a schema symlink is broken

jmileham · jmileham · commit d8de0c2e4162 · 2019-05-22T11:57:24.000-04:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 
-VERSION=0.9.7
+VERSION=0.9.8
 BUILD=`git rev-parse HEAD`
 
 LDFLAGS=-ldflags "-w -s \
diff --git a/schema/schema.go b/schema/schema.go
@@ -109,7 +109,7 @@ func ReadMerged() (*serializers.Schema, error) {
 		if fi.Mode()&os.ModeSymlink != 0 {
 			path, err = os.Readlink(path)
 			if err != nil {
-				return nil, err
+				continue // It's OK if this symlink isn't traversable (e.g. app was uninstalled), we'll just skip it.
 			}
 		}
 		// Read file

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func ReadMerged() (*serializers.Schema, error) {`
`109`	`109`	`if fi.Mode()&os.ModeSymlink != 0 {`
`110`	`110`	`path, err = os.Readlink(path)`
`111`	`111`	`if err != nil {`
`112`		`- return nil, err`
	`112`	`+ continue // It's OK if this symlink isn't traversable (e.g. app was uninstalled), we'll just skip it.`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`// Read file`