Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

version: don't panic if read build info doesn't work #5210

Merged
merged 2 commits into from
Dec 19, 2022
Merged

version: don't panic if read build info doesn't work #5210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e50b4e7
version: don't panic if read build info doesn't work
lukedirtwalker Nov 18, 2022
5675fd2
exit early
lukedirtwalker Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions caddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,13 +864,21 @@ func Version() (simple, full string) {
// bi.Main... hopefully.
var module *debug.Module
bi, ok := debug.ReadBuildInfo()
if ok {
// find the Caddy module in the dependency list
for _, dep := range bi.Deps {
if dep.Path == ImportPath {
module = dep
break
}
if !ok {
if CustomVersion != "" {
full = CustomVersion
simple = CustomVersion
return
}
full = "unknown"
simple = "unknown"
return
}
// find the Caddy module in the dependency list
for _, dep := range bi.Deps {
if dep.Path == ImportPath {
module = dep
break
}
}
if module != nil {
Expand Down