fix: #14 to support some arch linux #15
Merged
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
cfc4n
reviewed
Mar 29, 2022
user/config_openssl.go
Outdated
| if e != nil { | ||
| prefix = OTHERS_BINARY_PREFIX | ||
| } | ||
| this.Openssl = prefix + "/libssl.so.1.1" |
There was a problem hiding this comment.
please use filepath.Join() to concatenate strings.
There was a problem hiding this comment.
of course, I prefer to use git rebase -i HEAD~3 could I do it that way ?
user/probe_gnutls.go
Outdated
| switch this.conf.(*GnutlsConfig).elfType { | ||
| case ELF_TYPE_BIN: | ||
| binaryPath = this.conf.(*GnutlsConfig).Curlpath | ||
| case ELF_TYPE_SO: | ||
| binaryPath = this.conf.(*GnutlsConfig).Gnutls | ||
| default: | ||
| //如果没找到 | ||
| binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30" | ||
| binaryPath = prefix + "/libgnutls.so.30" |
There was a problem hiding this comment.
keep origin value due binaryPath is certain from config_* struct.
There was a problem hiding this comment.
keep origin value due
binaryPathis certain fromconfig_*struct.
Sorry I missed to understand this comment, why the logic should change here?
cfc4n
reviewed
Mar 29, 2022
user/probe_gnutls.go
Outdated
| switch this.conf.(*GnutlsConfig).elfType { | ||
| case ELF_TYPE_BIN: | ||
| binaryPath = this.conf.(*GnutlsConfig).Curlpath | ||
| case ELF_TYPE_SO: | ||
| binaryPath = this.conf.(*GnutlsConfig).Gnutls | ||
| default: | ||
| //如果没找到 | ||
| binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30" | ||
| binaryPath = filepath.Join(prefix, "libgnutls.so.30") |
There was a problem hiding this comment.
please rollback this code block. search .so path must be finished by config_ . probe_module do not choose so_ ,just use a default value.
|
Rollback and fixed |
|
LGTM, thanks. |
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.
fix: #14 by changing the root dir.