Fix file backend #686
Merged
Fix file backend #686
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
AndrewChubatiuk
commented
Mar 8, 2018
•
AndrewChubatiuk
commented
- Fixes YML-file backend does not honor Keys list from toml file #667. Fixes confd fails to read non-string keys when using file backend #640
- Added support for multiple yaml files and directories
- Added -filter flag for files/directories filtering
- Added recursive file watcher
added 8 commits
March 4, 2018 00:41
…ty to specify multiple file backends
added 8 commits
March 10, 2018 11:05
AndrewChubatiuk
force-pushed
the
file-yaml-backend-fix
branch
from
aa61feb to
2611c46
Compare
okushchenko
requested changes
Mar 12, 2018
util/filestat_windows.go
Outdated
| // fileStat return a fileInfo describing the named file. | ||
| func fileStat(name string) (fi fileInfo, err error) { | ||
| // filestat return a FileInfo describing the named file. | ||
| func filestat(name string) (fi FileInfo, err error) { | ||
| if isFileExist(name) { |
There was a problem hiding this comment.
This one should be uppercase.
config.go
Outdated
| @@ -97,7 +99,8 @@ func init() { | |||
| flag.StringVar(&clientKey, "client-key", "", "the client key") | |||
| flag.StringVar(&confdir, "confdir", "/etc/confd", "confd conf directory") | |||
| flag.StringVar(&configFile, "config-file", "", "the confd config file") | |||
| flag.StringVar(&yamlFile, "file", "", "the YAML/JSON file to watch for changes") | |||
| flag.Var(&yamlFile, "file", "the YAML file to watch for changes") | |||
There was a problem hiding this comment.
Add a comment to indicate that this var is only used by file backend.
config_test.go
Outdated
| @@ -23,6 +23,7 @@ func TestInitConfigDefaultConfig(t *testing.T) { | |||
| Scheme: "http", | |||
| SecretKeyring: "", | |||
| Table: "", | |||
| Filter: "*", | |||
backends/file/client.go
Outdated
| } | ||
|
|
||
| for _, path := range filePaths { | ||
| readFile(path, vars) |
backends/file/client.go
Outdated
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *Client) watchChanges(watcher *fsnotify.Watcher, stopChan chan bool) ResultError { | ||
| outputChannel := make(chan ResultError) | ||
| go func() error { |
There was a problem hiding this comment.
This one will cause goroutine leak. WatchPrefix function is actually called in a loop in the main function. WatchPrefix should block until it receives an event and exit afterward.
util/util.go
Outdated
| return false, nil | ||
| } | ||
|
|
||
| func Lookup(root string, pattern string) ([]string, []string, error) { |
There was a problem hiding this comment.
Lookup is very ambiguous. Rename it to recursiveFindFiles or something more appropriate.
resource/template/resource.go
Outdated
| @@ -345,7 +346,7 @@ func runCommand(cmd string) error { | |||
| // from the store, then we stage a candidate configuration file, and finally sync | |||
| // things up. | |||
| // It returns an error if any. | |||
| func (t *TemplateResource) process() error { | |||
| func (t *TemplateResource) generateConfigs() error { | |||
There was a problem hiding this comment.
process is actually a better name for this method because it is a method of a TemplateResource and we process a template.
resource/template/processor.go
Outdated
| defer close(p.doneChan) | ||
| p.reloadConfigs() | ||
| c := make(chan os.Signal, 1) | ||
| signal.Notify(c, syscall.SIGHUP) |
There was a problem hiding this comment.
Let's move the sighup handling / config reloading into a separate PR.
okushchenko
reviewed
Mar 12, 2018
backends/file/client.go
Outdated
| if event.Op&fsnotify.Write == fsnotify.Write || | ||
| event.Op&fsnotify.Remove == fsnotify.Remove || | ||
| event.Op&fsnotify.Create == fsnotify.Create || | ||
| event.Op&fsnotify.Rename == fsnotify.Rename || |
There was a problem hiding this comment.
What is the purpose of handling Rename and Chmod events?
AndrewChubatiuk
force-pushed
the
file-yaml-backend-fix
branch
from
2611c46 to
27428bb
Compare
added 2 commits
March 12, 2018 13:22
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.