From be361b7da4cd488ab845896cfff1d2e2169dcedd Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 5 Oct 2016 13:00:13 -0700 Subject: [PATCH] move the proc package under util --- cmd/castled/castled.go | 2 +- pkg/cephmgr/monagent.go | 2 +- pkg/cephmgr/monagent_test.go | 2 +- pkg/cephmgr/osd.go | 2 +- pkg/cephmgr/osdagent.go | 2 +- pkg/cephmgr/osdagent_test.go | 2 +- pkg/clusterd/clusterMember_test.go | 2 +- pkg/clusterd/clusterservice.go | 2 +- pkg/clusterd/inventory/disk.go | 2 +- pkg/clusterd/inventory/node.go | 2 +- pkg/clusterd/join.go | 2 +- pkg/{ => util}/proc/exec.go | 0 pkg/{ => util}/proc/monitoredproc.go | 0 pkg/{ => util}/proc/process_unix.go | 0 pkg/{ => util}/proc/procmanager.go | 0 15 files changed, 11 insertions(+), 11 deletions(-) rename pkg/{ => util}/proc/exec.go (100%) rename pkg/{ => util}/proc/monitoredproc.go (100%) rename pkg/{ => util}/proc/process_unix.go (100%) rename pkg/{ => util}/proc/procmanager.go (100%) diff --git a/cmd/castled/castled.go b/cmd/castled/castled.go index c5f47637f..997ce3c1e 100644 --- a/cmd/castled/castled.go +++ b/cmd/castled/castled.go @@ -17,7 +17,7 @@ import ( "github.com/quantum/castle/pkg/cephmgr" "github.com/quantum/castle/pkg/cephmgr/cephd" "github.com/quantum/castle/pkg/clusterd" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util/flags" ) diff --git a/pkg/cephmgr/monagent.go b/pkg/cephmgr/monagent.go index 19cdda95a..c42aa6db1 100644 --- a/pkg/cephmgr/monagent.go +++ b/pkg/cephmgr/monagent.go @@ -11,7 +11,7 @@ import ( "github.com/quantum/castle/pkg/cephmgr/client" "github.com/quantum/castle/pkg/clusterd" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ) diff --git a/pkg/cephmgr/monagent_test.go b/pkg/cephmgr/monagent_test.go index d12606cb7..cf9443099 100644 --- a/pkg/cephmgr/monagent_test.go +++ b/pkg/cephmgr/monagent_test.go @@ -9,7 +9,7 @@ import ( testceph "github.com/quantum/castle/pkg/cephmgr/client/test" "github.com/quantum/castle/pkg/clusterd" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cephmgr/osd.go b/pkg/cephmgr/osd.go index f29ac2c35..38bdf0470 100644 --- a/pkg/cephmgr/osd.go +++ b/pkg/cephmgr/osd.go @@ -22,7 +22,7 @@ import ( "github.com/quantum/castle/pkg/cephmgr/client" "github.com/quantum/castle/pkg/clusterd" "github.com/quantum/castle/pkg/clusterd/inventory" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ) diff --git a/pkg/cephmgr/osdagent.go b/pkg/cephmgr/osdagent.go index e0498199b..4a7299932 100644 --- a/pkg/cephmgr/osdagent.go +++ b/pkg/cephmgr/osdagent.go @@ -17,7 +17,7 @@ import ( "github.com/quantum/castle/pkg/cephmgr/client" "github.com/quantum/castle/pkg/clusterd" "github.com/quantum/castle/pkg/clusterd/inventory" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ) diff --git a/pkg/cephmgr/osdagent_test.go b/pkg/cephmgr/osdagent_test.go index b0a303159..f35d92215 100644 --- a/pkg/cephmgr/osdagent_test.go +++ b/pkg/cephmgr/osdagent_test.go @@ -13,7 +13,7 @@ import ( testceph "github.com/quantum/castle/pkg/cephmgr/client/test" "github.com/quantum/castle/pkg/clusterd" "github.com/quantum/castle/pkg/clusterd/inventory" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/clusterd/clusterMember_test.go b/pkg/clusterd/clusterMember_test.go index 1393aab3b..080a5d053 100644 --- a/pkg/clusterd/clusterMember_test.go +++ b/pkg/clusterd/clusterMember_test.go @@ -11,7 +11,7 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/coreos/etcd/store" "github.com/quantum/castle/pkg/clusterd/inventory" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" "github.com/stretchr/testify/assert" ctx "golang.org/x/net/context" diff --git a/pkg/clusterd/clusterservice.go b/pkg/clusterd/clusterservice.go index ab9654bca..bb2456da7 100644 --- a/pkg/clusterd/clusterservice.go +++ b/pkg/clusterd/clusterservice.go @@ -3,7 +3,7 @@ package clusterd import ( etcd "github.com/coreos/etcd/client" "github.com/quantum/castle/pkg/clusterd/inventory" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ) diff --git a/pkg/clusterd/inventory/disk.go b/pkg/clusterd/inventory/disk.go index b2b4863cc..937420aaa 100644 --- a/pkg/clusterd/inventory/disk.go +++ b/pkg/clusterd/inventory/disk.go @@ -9,7 +9,7 @@ import ( "strings" etcd "github.com/coreos/etcd/client" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ctx "golang.org/x/net/context" ) diff --git a/pkg/clusterd/inventory/node.go b/pkg/clusterd/inventory/node.go index 73c570fce..03b1174d0 100644 --- a/pkg/clusterd/inventory/node.go +++ b/pkg/clusterd/inventory/node.go @@ -11,7 +11,7 @@ import ( ctx "golang.org/x/net/context" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" etcd "github.com/coreos/etcd/client" diff --git a/pkg/clusterd/join.go b/pkg/clusterd/join.go index dc1091ed0..975f6e2a0 100644 --- a/pkg/clusterd/join.go +++ b/pkg/clusterd/join.go @@ -6,7 +6,7 @@ import ( "github.com/quantum/castle/pkg/clusterd/inventory" "github.com/quantum/castle/pkg/etcdmgr/manager" - "github.com/quantum/castle/pkg/proc" + "github.com/quantum/castle/pkg/util/proc" "github.com/quantum/castle/pkg/util" ) diff --git a/pkg/proc/exec.go b/pkg/util/proc/exec.go similarity index 100% rename from pkg/proc/exec.go rename to pkg/util/proc/exec.go diff --git a/pkg/proc/monitoredproc.go b/pkg/util/proc/monitoredproc.go similarity index 100% rename from pkg/proc/monitoredproc.go rename to pkg/util/proc/monitoredproc.go diff --git a/pkg/proc/process_unix.go b/pkg/util/proc/process_unix.go similarity index 100% rename from pkg/proc/process_unix.go rename to pkg/util/proc/process_unix.go diff --git a/pkg/proc/procmanager.go b/pkg/util/proc/procmanager.go similarity index 100% rename from pkg/proc/procmanager.go rename to pkg/util/proc/procmanager.go