From 49fabfbb2921074438208789ec911289cc0d3609 Mon Sep 17 00:00:00 2001 From: lwh Date: Sun, 17 Dec 2017 01:12:24 +0800 Subject: [PATCH 1/2] Complement package name Signed-off-by: lwh --- controllers/task.go | 6 +++--- controllers/task_op.go | 4 ++-- lib/config/task.go | 5 +++-- lib/monitor/monitor.go | 3 ++- lib/psutil/psstate.go | 2 +- main.go | 6 ++++-- routers/router.go | 2 +- task/task.go | 3 ++- task/task_funcs.go | 6 +++--- task/task_manager.go | 5 +++-- task/task_manager_test.go | 5 +++-- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/controllers/task.go b/controllers/task.go index 86484f1..2caaf0f 100644 --- a/controllers/task.go +++ b/controllers/task.go @@ -2,10 +2,10 @@ package controllers import ( "encoding/json" - "sir/lib/config" - "sir/models" - "sir/task" + "github.com/foreversmart/sir/lib/config" + "github.com/foreversmart/sir/models" + "github.com/foreversmart/sir/task" "github.com/astaxie/beego" ) diff --git a/controllers/task_op.go b/controllers/task_op.go index ba41dc6..c4570a5 100644 --- a/controllers/task_op.go +++ b/controllers/task_op.go @@ -1,8 +1,8 @@ package controllers import ( - "sir/lib/config" - "sir/models" + "github.com/foreversmart/sir/lib/config" + "github.com/foreversmart/sir/models" "github.com/astaxie/beego" ) diff --git a/lib/config/task.go b/lib/config/task.go index c87c462..8673cd5 100644 --- a/lib/config/task.go +++ b/lib/config/task.go @@ -4,10 +4,11 @@ import ( "io/ioutil" "os" "runtime" - "sir/lib/errors" - "sir/models" "time" + "github.com/foreversmart/sir/lib/errors" + "github.com/foreversmart/sir/models" + "log" "github.com/BurntSushi/toml" diff --git a/lib/monitor/monitor.go b/lib/monitor/monitor.go index 1be7942..9d9c1bc 100644 --- a/lib/monitor/monitor.go +++ b/lib/monitor/monitor.go @@ -4,9 +4,10 @@ import ( "bytes" "log" "net/http" - "sir/models" "strconv" + "github.com/foreversmart/sir/models" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/lib/psutil/psstate.go b/lib/psutil/psstate.go index e9d6019..4921287 100644 --- a/lib/psutil/psstate.go +++ b/lib/psutil/psstate.go @@ -1,7 +1,7 @@ package psutil import ( - "sir/models" + "github.com/foreversmart/sir/models" "log" diff --git a/main.go b/main.go index b75d6f6..9050c37 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,10 @@ package main import ( "os" - "sir/lib/config" - _ "sir/routers" + + _ "github.com/foreversmart/sir/routers" + + "github.com/foreversmart/sir/lib/config" "github.com/astaxie/beego" ) diff --git a/routers/router.go b/routers/router.go index 53e5c6c..7bf1906 100644 --- a/routers/router.go +++ b/routers/router.go @@ -1,7 +1,7 @@ package routers import ( - "sir/controllers" + "github.com/foreversmart/sir/controllers" "github.com/astaxie/beego" ) diff --git a/task/task.go b/task/task.go index a423a44..025330f 100644 --- a/task/task.go +++ b/task/task.go @@ -2,7 +2,8 @@ package task import ( "fmt" - "sir/models" + + "github.com/foreversmart/sir/models" "os" "os/user" diff --git a/task/task_funcs.go b/task/task_funcs.go index 961cba5..7e78c27 100644 --- a/task/task_funcs.go +++ b/task/task_funcs.go @@ -5,9 +5,9 @@ import ( "log" "os" "os/signal" - "sir/lib/monitor" - "sir/lib/psutil" - "sir/models" + "github.com/foreversmart/sir/lib/monitor" + "github.com/foreversmart/sir/lib/psutil" + "github.com/foreversmart/sir/models" "syscall" "time" diff --git a/task/task_manager.go b/task/task_manager.go index 6e3464c..da09900 100644 --- a/task/task_manager.go +++ b/task/task_manager.go @@ -2,12 +2,13 @@ package task import ( "fmt" - "github.com/shirou/gopsutil/process" "log" "os" "path" - "sir/models" "sync" + + "github.com/foreversmart/sir/models" + "github.com/shirou/gopsutil/process" ) type TaskManager struct { diff --git a/task/task_manager_test.go b/task/task_manager_test.go index fb83600..b2c70fe 100644 --- a/task/task_manager_test.go +++ b/task/task_manager_test.go @@ -1,10 +1,11 @@ package task import ( - "github.com/stretchr/testify/assert" - "sir/models" "testing" "time" + + "github.com/foreversmart/sir/models" + "github.com/stretchr/testify/assert" ) func TestTaskManager_StartTask(t *testing.T) { From 0c61f8941e636a594683b12529c132aaad2dbea4 Mon Sep 17 00:00:00 2001 From: lwh Date: Sun, 17 Dec 2017 01:30:45 +0800 Subject: [PATCH 2/2] Complement package name of cli directory Signed-off-by: lwh --- cli/commands/add.go | 11 ++++++----- cli/commands/list.go | 9 +++++---- cli/commands/log.go | 7 ++++--- cli/commands/remove.go | 7 ++++--- cli/commands/restart.go | 7 ++++--- cli/commands/show.go | 9 +++++---- cli/commands/start.go | 7 ++++--- cli/commands/statistics.go | 9 +++++---- cli/commands/stop.go | 7 ++++--- cli/commands/update.go | 7 ++++--- cli/opts/add.go | 3 ++- cli/sir.go | 2 +- cli/utils/render.go | 5 ++--- 13 files changed, 50 insertions(+), 40 deletions(-) diff --git a/cli/commands/add.go b/cli/commands/add.go index eb9c7a8..7288bd4 100644 --- a/cli/commands/add.go +++ b/cli/commands/add.go @@ -4,13 +4,14 @@ import ( "fmt" "net/http" "os" - "sir/cli/config" - "sir/cli/opts" - "sir/cli/utils" - "sir/lib/httpclient" - "sir/models" "strings" + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/opts" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" + "github.com/foreversmart/sir/models" + cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/list.go b/cli/commands/list.go index de3c771..54dc9c2 100644 --- a/cli/commands/list.go +++ b/cli/commands/list.go @@ -3,10 +3,11 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" - "sir/models" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" + "github.com/foreversmart/sir/models" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/log.go b/cli/commands/log.go index 8bb2823..e2196ff 100644 --- a/cli/commands/log.go +++ b/cli/commands/log.go @@ -5,9 +5,10 @@ import ( "net/http" "os" "os/exec" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/remove.go b/cli/commands/remove.go index 136f546..f69db7e 100644 --- a/cli/commands/remove.go +++ b/cli/commands/remove.go @@ -3,9 +3,10 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/restart.go b/cli/commands/restart.go index 2a5701b..45a9f45 100644 --- a/cli/commands/restart.go +++ b/cli/commands/restart.go @@ -3,9 +3,10 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/show.go b/cli/commands/show.go index 1eb8e0e..6eea189 100644 --- a/cli/commands/show.go +++ b/cli/commands/show.go @@ -2,10 +2,11 @@ package commands import ( "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" - "sir/models" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" + "github.com/foreversmart/sir/models" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/start.go b/cli/commands/start.go index 67539fd..4b64500 100644 --- a/cli/commands/start.go +++ b/cli/commands/start.go @@ -3,9 +3,10 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/statistics.go b/cli/commands/statistics.go index 038c158..7d81288 100644 --- a/cli/commands/statistics.go +++ b/cli/commands/statistics.go @@ -3,10 +3,11 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" - "sir/models" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" + "github.com/foreversmart/sir/models" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/stop.go b/cli/commands/stop.go index 60b9fbb..43ae325 100644 --- a/cli/commands/stop.go +++ b/cli/commands/stop.go @@ -3,9 +3,10 @@ package commands import ( "fmt" "net/http" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/commands/update.go b/cli/commands/update.go index 6899f50..f2f9316 100644 --- a/cli/commands/update.go +++ b/cli/commands/update.go @@ -5,9 +5,10 @@ import ( "net/http" "os" "os/exec" - "sir/cli/config" - "sir/cli/utils" - "sir/lib/httpclient" + + "github.com/foreversmart/sir/cli/config" + "github.com/foreversmart/sir/cli/utils" + "github.com/foreversmart/sir/lib/httpclient" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/opts/add.go b/cli/opts/add.go index 0f42756..6867023 100644 --- a/cli/opts/add.go +++ b/cli/opts/add.go @@ -1,9 +1,10 @@ package opts import ( - "sir/models" "strings" + "github.com/foreversmart/sir/models" + cli "gopkg.in/urfave/cli.v1" ) diff --git a/cli/sir.go b/cli/sir.go index 3ede500..eeac693 100644 --- a/cli/sir.go +++ b/cli/sir.go @@ -3,7 +3,7 @@ package main import ( "os" - "sir/cli/commands" + "github.com/foreversmart/sir/cli/commands" "gopkg.in/urfave/cli.v1" ) diff --git a/cli/utils/render.go b/cli/utils/render.go index c74fb09..ef1cc6b 100644 --- a/cli/utils/render.go +++ b/cli/utils/render.go @@ -2,13 +2,12 @@ package utils import ( "fmt" - "sir/models" "sort" "strconv" "time" - "github.com/dustin/go-humanize" - + humanize "github.com/dustin/go-humanize" + "github.com/foreversmart/sir/models" "github.com/yanhao1991/tablewriter" cli "gopkg.in/urfave/cli.v1" )