Skip to content

Change get endpoint driect from dockerdata #3

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

Open
zillaer wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change get endpoint driect from dockerdata #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0208362
Change get endpoint driect from dockerdata
zillaer Mar 25, 2016
518989b
Update README.md
zillaer Mar 25, 2016
7e7e7b0
fix hostname only return short
zillaer Mar 25, 2016
9d18dd6
fix hostname loss .
zillaer Mar 25, 2016
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ biuld方法：
Contributors
------------------------------------------
- mengzhuo: QQ:296142139; MAIL:mengzhuo@xiaomi.com
- hangyuzhang: MAIL:hangyuzhang@meilishuo.com
23 changes: 3 additions & 20 deletions getDatas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,9 @@ func getContainerId(cadvisorData string) string {
}

func getEndPoint(DockerData string) string {
filepath := getBetween(DockerData, `"HostsPath":"`, `",`)
buf := make(map[int]string, 6)
inputFile, inputError := os.Open(filepath)
if inputError != nil {
LogErr(inputError, "getEndPoint open file err"+filepath)
return ""
}
defer inputFile.Close()

inputReader := bufio.NewReader(inputFile)
lineCounter := 0
for i := 0; i < 2; i++ {
inputString, readerError := inputReader.ReadString('\n')
if readerError == io.EOF {
break
}
lineCounter++
buf[lineCounter] = inputString
}
hostname := strings.Split(buf[1], " ")[0]
hostnameprefix := getBetween(DockerData, `"Hostname":"`, `",`)
hostnamesubfix := getBetween(DockerData, `"Domainname":"`, `",`)
hostname := hostnameprefix + `.` + hostnamesubfix
return hostname
}

Expand Down