workaround for Windows path and update README about plugin path #32
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
tukaelu
approved these changes
Dec 21, 2023
| @@ -85,7 +87,17 @@ func (opts *mackerelMetricOpts) run() *checkers.Checker { | |||
|
|
|||
| conf, err := config.LoadConfig(config.DefaultConfig.Conffile) | |||
| if err != nil { | |||
| return checkers.Unknown(fmt.Sprintf("%v", err)) | |||
| if runtime.GOOS == "windows" { | |||
| newpath := filepath.Join(config.DefaultConfig.Conffile, "../../../mackerel-agent.conf") | |||
There was a problem hiding this comment.
[note]
It will probably be something like this:
C:\Program Files\Mackerel\mackerel-agent\plugins\bin\mackerel-agent.conf\..\..\..\mackerel-agent.conf
↓
C:\Program Files\Mackerel\mackerel-agent\mackerel-agent.conf
There was a problem hiding this comment.
yes! it looks ugly workaround, but it is hard to change mackerel-agent config logic.
| newpath := filepath.Join(config.DefaultConfig.Conffile, "../../../mackerel-agent.conf") | ||
| conf, err = config.LoadConfig(newpath) | ||
| if err != nil { | ||
| return checkers.Unknown(fmt.Sprintf("%v", err)) |
There was a problem hiding this comment.
I think the following kind of code would also be good.
Suggested change
| return checkers.Unknown(fmt.Sprintf("%v", err)) | |
| return checkers.Unknown(err.Error()) |
There was a problem hiding this comment.
Thanks! I'll apply it to other projects... 😻
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.
This PR fixes 2 issues.
Update README:
Windows plugin will be installed to C:\Program Files\Mackerel\mackerel-agent\plugins\bin by mkr plugin install.
Linux plugin will be installed to /opt/mackerel-agent/bin.
Users must specify these paths explicitly.
Update handling DefaultConfig.Conffile:
config(from mackerel-agent library).DefaultConfig.Conffile's behaves dfferently in Linux and Windows.
On Linux, it refers to /etc/mackerel-agent.conf, regardless of the location of the plugin.
But on Windows, it mysteriously points to mackerel-agent.conf in the plugin path C:\Program Files\Mackerel\mackerel-agent\plugins\bin\mackerel-agent.conf (yes, this is an invalid location).
The code I put in run() is awkward, but it acts as a workaround.