From 350244cadf68eb511ead6da4b61f8f0c60520620 Mon Sep 17 00:00:00 2001 From: lwch Date: Fri, 5 Aug 2022 16:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.go | 2 +- app_handler.go | 2 +- app_net.go | 4 ++-- conf/configure.go | 2 +- conf/rewrite.go | 2 +- {hostinfo => internal/hostinfo}/info.go | 0 {hostinfo => internal/hostinfo}/info_fallback.go | 0 {hostinfo => internal/hostinfo}/info_windows.go | 0 {utils => internal/utils}/bytes.go | 0 {utils => internal/utils}/bytes_test.go | 0 {utils => internal/utils}/duration.go | 0 {utils => internal/utils}/recover.go | 0 {utils => internal/utils}/utils.go | 0 limit/cgroups_test.go | 2 +- limit/configure.go | 2 +- 15 files changed, 8 insertions(+), 8 deletions(-) rename {hostinfo => internal/hostinfo}/info.go (100%) rename {hostinfo => internal/hostinfo}/info_fallback.go (100%) rename {hostinfo => internal/hostinfo}/info_windows.go (100%) rename {utils => internal/utils}/bytes.go (100%) rename {utils => internal/utils}/bytes_test.go (100%) rename {utils => internal/utils}/duration.go (100%) rename {utils => internal/utils}/recover.go (100%) rename {utils => internal/utils}/utils.go (100%) diff --git a/app.go b/app.go index ad98f34..0614fc0 100644 --- a/app.go +++ b/app.go @@ -7,7 +7,7 @@ import ( rt "runtime" "time" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/utils" "github.com/jkstack/anet" "github.com/jkstack/jkframe/logging" ) diff --git a/app_handler.go b/app_handler.go index f5c7a2f..6197642 100644 --- a/app_handler.go +++ b/app_handler.go @@ -6,7 +6,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/utils" "github.com/jkstack/anet" "github.com/jkstack/jkframe/logging" ) diff --git a/app_net.go b/app_net.go index d19828e..4c20035 100644 --- a/app_net.go +++ b/app_net.go @@ -8,8 +8,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/jkstack/agent/hostinfo" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/hostinfo" + "github.com/jkstack/agent/internal/utils" "github.com/jkstack/anet" "github.com/jkstack/jkframe/logging" "github.com/shirou/gopsutil/cpu" diff --git a/conf/configure.go b/conf/configure.go index 6f86114..f17ccc6 100644 --- a/conf/configure.go +++ b/conf/configure.go @@ -1,8 +1,8 @@ package conf import ( + "github.com/jkstack/agent/internal/utils" "github.com/jkstack/agent/limit" - "github.com/jkstack/agent/utils" ) // Configure common configure diff --git a/conf/rewrite.go b/conf/rewrite.go index e9c316b..7d429d7 100644 --- a/conf/rewrite.go +++ b/conf/rewrite.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/utils" "github.com/jkstack/jkframe/logging" runtime "github.com/jkstack/jkframe/utils" ) diff --git a/hostinfo/info.go b/internal/hostinfo/info.go similarity index 100% rename from hostinfo/info.go rename to internal/hostinfo/info.go diff --git a/hostinfo/info_fallback.go b/internal/hostinfo/info_fallback.go similarity index 100% rename from hostinfo/info_fallback.go rename to internal/hostinfo/info_fallback.go diff --git a/hostinfo/info_windows.go b/internal/hostinfo/info_windows.go similarity index 100% rename from hostinfo/info_windows.go rename to internal/hostinfo/info_windows.go diff --git a/utils/bytes.go b/internal/utils/bytes.go similarity index 100% rename from utils/bytes.go rename to internal/utils/bytes.go diff --git a/utils/bytes_test.go b/internal/utils/bytes_test.go similarity index 100% rename from utils/bytes_test.go rename to internal/utils/bytes_test.go diff --git a/utils/duration.go b/internal/utils/duration.go similarity index 100% rename from utils/duration.go rename to internal/utils/duration.go diff --git a/utils/recover.go b/internal/utils/recover.go similarity index 100% rename from utils/recover.go rename to internal/utils/recover.go diff --git a/utils/utils.go b/internal/utils/utils.go similarity index 100% rename from utils/utils.go rename to internal/utils/utils.go diff --git a/limit/cgroups_test.go b/limit/cgroups_test.go index f1beef8..259cbf9 100644 --- a/limit/cgroups_test.go +++ b/limit/cgroups_test.go @@ -3,7 +3,7 @@ package limit import ( "testing" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/utils" ) func TestCGroups(t *testing.T) { diff --git a/limit/configure.go b/limit/configure.go index dcc3b2d..adb1191 100644 --- a/limit/configure.go +++ b/limit/configure.go @@ -3,7 +3,7 @@ package limit import ( "encoding/json" - "github.com/jkstack/agent/utils" + "github.com/jkstack/agent/internal/utils" ) // DiskLimit disk limit configure