Mirrored_Repos/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2024-08-30 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from stokito/leftovers

Browse Source 
Use standard Go functions
This commit is contained in:
bradley 2020-11-29 09:06:13 -05:00 committed by GitHub
commit bec78c90b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/file.go
View File

@ -3,6 +3,7 @@ package config
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
"regexp" "regexp"
"strings" "strings"
@ -81,7 +82,7 @@ func Write() (path string, err error) {
return path, err return path, err
} }
cfgdir := basedir(path) cfgdir := filepath.Dir(path)
// create config dir if not exist // create config dir if not exist
if _, err := os.Stat(cfgdir); err != nil { if _, err := os.Stat(cfgdir); err != nil {
err = os.MkdirAll(cfgdir, 0755) err = os.MkdirAll(cfgdir, 0755)
@ -141,8 +142,3 @@ func xdgSupport() bool {
} }
return false return false
} }
func basedir(path string) string {
parts := strings.Split(path, "/")
return strings.Join((parts[0 : len(parts)-1]), "/")
}

8
connector/collector/docker_logs.go
View File

@ -47,9 +47,9 @@ func (l *DockerLogs) Stream() chan models.Log {
go func() { go func() {
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
for scanner.Scan() { for scanner.Scan() {
parts := strings.Split(scanner.Text(), " ") parts := strings.SplitN(scanner.Text(), " ", 2)
ts := l.parseTime(parts[0]) ts := l.parseTime(parts[0])
logCh <- models.Log{Timestamp: ts, Message: strings.Join(parts[1:], " ")} logCh <- models.Log{Timestamp: ts, Message: parts[1]}
} }
}() }()
@ -74,12 +74,12 @@ func (l *DockerLogs) Stream() chan models.Log {
func (l *DockerLogs) Stop() { l.done <- true } func (l *DockerLogs) Stop() { l.done <- true }
func (l *DockerLogs) parseTime(s string) time.Time { func (l *DockerLogs) parseTime(s string) time.Time {
ts, err := time.Parse("2006-01-02T15:04:05.000000000Z", s) ts, err := time.Parse(time.RFC3339Nano, s)
if err == nil { if err == nil {
return ts return ts
} }
ts, err2 := time.Parse("2006-01-02T15:04:05.000000000Z", l.stripPfx(s)) ts, err2 := time.Parse(time.RFC3339Nano, l.stripPfx(s))
if err2 == nil { if err2 == nil {
return ts return ts
} }

2
connector/docker.go
View File

@ -290,5 +290,5 @@ func (cm *Docker) All() (containers container.Containers) {
// use primary container name // use primary container name
func shortName(name string) string { func shortName(name string) string {
return strings.Replace(name, "/", "", 1) return strings.TrimPrefix(name, "/")
} }

4
menus.go
View File

@ -130,7 +130,7 @@ func ColumnsMenu() MenuFn {
m.Selectable = true m.Selectable = true
m.SortItems = false m.SortItems = false
m.BorderLabel = "Columns" m.BorderLabel = "Columns"
//m.SubText = "Enabled Columns" m.SubText = "Re-order: <Page Up> / <Page Down>"
rebuild := func() { rebuild := func() {
// get padding for right alignment of enabled status // get padding for right alignment of enabled status
@ -258,7 +258,7 @@ func ContainerMenu() MenuFn {
ui.StopLoop() ui.StopLoop()
}) })
} }
if c.Meta["state"] != "exited" || c.Meta["state"] != "created" { if c.Meta["state"] != "exited" && c.Meta["state"] != "created" {
ui.Handle("/sys/kbd/p", func(ui.Event) { ui.Handle("/sys/kbd/p", func(ui.Event) {
if c.Meta["state"] == "paused" { if c.Meta["state"] == "paused" {
selected = "unpause" selected = "unpause"