Skip to content

Fixed the #108 issue. #154

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

Merged
merged 3 commits into from
Jun 4, 2018
Merged

Fixed the #108 issue. #154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea1bbed
Fixed the #108 issue.
May 26, 2018
4d52242
Added the array length check to the GetOSDetails function.
Jun 1, 2018
76badaf
Fixed typo
Jun 4, 2018
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
17 changes: 12 additions & 5 deletions telemetry/telemetry_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,21 @@ func (report *Report) GetSystemDetails() {

// This function creates a report with os details(ostype, version).
func (report *Report) GetOSDetails() {
linesArr, err := ReadFileByLines("/etc/issue")
linesArr, err := ReadFileByLines("/etc/os-release")
if err != nil || len(linesArr) <= 0 {
report.OSDetails = &OSInfo{OSType: runtime.GOOS}
report.OSDetails.ErrorMessage = "reading /etc/issue failed with" + err.Error()
report.OSDetails.ErrorMessage = "reading /etc/os-release failed with" + err.Error()
return
}

osInfoArr := strings.Split(linesArr[0], " ")
osInfoArr := make(map[string]string)

for i := range linesArr {
s := strings.Split(linesArr[i], "=")
Copy link
Member

@tamilmani1989 tamilmani1989 May 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we check if split succeeds by checking the length of s?

Copy link
Contributor Author

@IvanovOleg IvanovOleg Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check if the latest commit is what you want.

if len(s) == 2 {
osInfoArr[s[0]] = strings.TrimSuffix(s[1], "\n")
}
}

out, err := exec.Command("uname", "-r").Output()
if err != nil {
Expand All @@ -109,8 +116,8 @@ func (report *Report) GetOSDetails() {

report.OSDetails = &OSInfo{
OSType: runtime.GOOS,
OSVersion: osInfoArr[1],
OSVersion: osInfoArr["VERSION"],
KernelVersion: kernelVersion,
OSDistribution: osInfoArr[0],
OSDistribution: osInfoArr["ID"],
}
}