Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • oss/libraries/go/application/configuration
1 result
Select Git revision
Show changes
Commits on Source (3)
<a name="v1.11.2"></a>
## [v1.11.2] - 2022-10-23
### Bug Fixes
- fix deleted files must not be removed from the watch list
<a name="v1.11.1"></a>
## [v1.11.1] - 2022-10-23
### Bug Fixes
......@@ -119,6 +125,7 @@
<a name="v1.0.0"></a>
## v1.0.0 - 2022-09-18
[v1.11.2]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.1...v1.11.2
[v1.11.1]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.0...v1.11.1
[v1.11.0]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.10.0...v1.11.0
[v1.10.0]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.9.0...v1.10.0
......
......@@ -94,11 +94,7 @@ func (s *Settings[C]) importFiles() {
s.fileWatch.Lock()
// new files may have been added
tmpWatchList := make(map[string]bool)
defer func() {
s.fileWatch.watchList = tmpWatchList
s.fileWatch.Unlock()
}()
......@@ -122,9 +118,6 @@ func (s *Settings[C]) importFiles() {
r := (io.Reader)(f)
s.importStream(reader{s.files.format, r})
f.Close()
tmpWatchList[fn] = true
}
for _, f := range s.files.files {
......@@ -135,10 +128,11 @@ func (s *Settings[C]) importFiles() {
r.Close()
continue
}
s.importStream(reader{f.format, r})
r.Close()
tmpWatchList[f.path] = true
}
}
......
{"version":"1.11.1"}
{"version":"1.11.2"}
......@@ -98,18 +98,18 @@ func (s *Settings[C]) Watch() *Settings[C] {
}
// add all files to the watch list
for file := range s.fileWatch.watchList {
for filePath := range s.fileWatch.watchList {
fileInfo, err := os.Stat(file)
fileInfo, err := os.Stat(filePath)
if err != nil {
s.errors = append(s.errors, err)
continue
}
if fileInfo.IsDir() {
err = s.fileWatch.watcher.Add(file)
err = s.fileWatch.watcher.Add(filePath)
} else {
err = s.fileWatch.watcher.Add(path.Dir(file))
err = s.fileWatch.watcher.Add(path.Dir(filePath))
}
if err != nil {
......