OLD | NEW |
1 // Copyright 2016 The LUCI Authors. All rights reserved. | 1 // Copyright 2016 The LUCI Authors. All rights reserved. |
2 // Use of this source code is governed under the Apache License, Version 2.0 | 2 // Use of this source code is governed under the Apache License, Version 2.0 |
3 // that can be found in the LICENSE file. | 3 // that can be found in the LICENSE file. |
4 | 4 |
5 package main | 5 package main |
6 | 6 |
7 import ( | 7 import ( |
8 "path/filepath" | 8 "path/filepath" |
9 | 9 |
10 "github.com/luci/luci-go/common/errors" | 10 "github.com/luci/luci-go/common/errors" |
(...skipping 15 matching lines...) Expand all Loading... |
26 | 26 |
27 configPath := filepath.Join(path, userCfgName) | 27 configPath := filepath.Join(path, userCfgName) |
28 switch err := unmarshalTextProtobuf(configPath, cfg); { | 28 switch err := unmarshalTextProtobuf(configPath, cfg); { |
29 case err == nil: | 29 case err == nil: |
30 log.Infof(c, "Loaded user config from: %s", configPath) | 30 log.Infof(c, "Loaded user config from: %s", configPath) |
31 | 31 |
32 case isNotExist(err): | 32 case isNotExist(err): |
33 log.Debugf(c, "No user config found at: %s", configPath) | 33 log.Debugf(c, "No user config found at: %s", configPath) |
34 | 34 |
35 default: | 35 default: |
36 » » return errors.Annotate(err).Reason("failed to load config at [%(
path)s]").D("path", configPath).Err() | 36 » » return errors.Annotate(err, "failed to load config at [%s]", con
figPath).Err() |
37 } | 37 } |
38 | 38 |
39 return nil | 39 return nil |
40 } | 40 } |
OLD | NEW |