mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-19 23:37:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

autoreload: do not ignore errors

Browse source 
Signed-off-by: Julien <roidelapluie@o11y.eu>
This commit is contained in:
Julien 2024-09-03 11:37:14 +02:00
parent cfe8b5616f
commit 2c553b1772
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
config/reload.go
View file

@ -36,7 +36,10 @@ func GenerateChecksum(yamlFilePath string) (string, error) {
if err != nil { if err != nil {
return "", fmt.Errorf("error reading YAML file: %w", err) return "", fmt.Errorf("error reading YAML file: %w", err)
} }
_, _ = hash.Write(yamlContent) _, err = hash.Write(yamlContent)
if err != nil {
return "", fmt.Errorf("error writing YAML file to hash: %w", err)
}
var config ExternalFilesConfig var config ExternalFilesConfig
if err := yaml.Unmarshal(yamlContent, &config); err != nil { if err := yaml.Unmarshal(yamlContent, &config); err != nil {
@ -61,23 +64,26 @@ func GenerateChecksum(yamlFilePath string) (string, error) {
for _, pattern := range files[prefix] { for _, pattern := range files[prefix] {
matchingFiles, err := filepath.Glob(pattern) matchingFiles, err := filepath.Glob(pattern)
if err != nil { if err != nil {
return "", fmt.Errorf("error finding files with pattern %s: %w", pattern, err) return "", fmt.Errorf("error finding files with pattern %q: %w", pattern, err)
} }
for _, file := range matchingFiles { for _, file := range matchingFiles {
// Write prefix to the hash ("r" or "s") followed by \0. // Write prefix to the hash ("r" or "s") followed by \0, then
_, _ = hash.Write([]byte(prefix + "\x00")) // the file path.
_, err = hash.Write([]byte(prefix + "\x00" + file + "\x00"))
// Write the file path to the hash, followed by \0 to ensure if err != nil {
// separation. return "", fmt.Errorf("error writing %q path to hash: %w", file, err)
_, _ = hash.Write([]byte(file + "\x00")) }
// Read and hash the content of the file. // Read and hash the content of the file.
content, err := os.ReadFile(file) content, err := os.ReadFile(file)
if err != nil { if err != nil {
return "", fmt.Errorf("error reading file %s: %w", file, err) return "", fmt.Errorf("error reading file %s: %w", file, err)
} }
_, _ = hash.Write(append(content, []byte("\x00")...)) _, err = hash.Write(append(content, []byte("\x00")...))
if err != nil {
return "", fmt.Errorf("error writing %q content to hash: %w", file, err)
}
} }
} }
} }