Skip to content

Commit b83872c

Browse files
Merge pull request #59 from mostlikelee/puppet-file-descriptor
bugfix: ensure file descriptor close on puppet file
2 parents a7faf84 + 6ba0fc7 commit b83872c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tables/puppet/yaml.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,28 @@ func yamlPath() string {
1919
}
2020

2121
func getPuppetYaml() (*PuppetInfo, error) {
22-
2322
var yamlData PuppetInfo
2423

2524
yamlFile, err := os.Open(yamlPath())
2625
if err != nil {
2726
log.Print(err)
2827
return &yamlData, err
2928
}
29+
defer yamlFile.Close()
3030

3131
buf := new(bytes.Buffer)
3232
_, err = buf.ReadFrom(yamlFile)
3333
if err != nil {
3434
return &yamlData, err
3535
}
36+
3637
yamlString := buf.String()
3738
yamlString = strings.Replace(yamlString, "\r", "\n", -1)
3839

3940
err = yaml.Unmarshal([]byte(yamlString), &yamlData)
4041
if err != nil {
4142
return &yamlData, err
4243
}
43-
yamlFile.Close()
44+
4445
return &yamlData, nil
4546
}

0 commit comments

Comments
 (0)