From 0a0700dda8fa5ba1cb5bbf96331ec9df00e16321 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 11 Oct 2022 11:17:58 +0800 Subject: [PATCH] refactor: move boomer from hrp internal to pkg --- hrp/boomer.go | 2 +- hrp/cmd/boom.go | 2 +- hrp/cmd/curl.go | 2 +- hrp/{internal => pkg}/boomer/README.md | 0 hrp/{internal => pkg}/boomer/boomer.go | 6 ++-- hrp/{internal => pkg}/boomer/boomer_test.go | 0 hrp/{internal => pkg}/boomer/client_grpc.go | 12 ++++---- .../boomer/client_grpc_test.go | 0 hrp/{internal => pkg}/boomer/data/data.go | 1 - .../boomer/data/x509/README.md | 0 .../boomer/data/x509/ca_cert.pem | 0 .../boomer/data/x509/ca_key.pem | 0 .../boomer/data/x509/client_ca_cert.pem | 0 .../boomer/data/x509/client_ca_key.pem | 0 .../boomer/data/x509/client_cert.pem | 0 .../boomer/data/x509/client_key.pem | 0 .../boomer/data/x509/create.sh | 0 .../boomer/data/x509/openssl.cnf | 0 .../boomer/data/x509/server_cert.pem | 0 .../boomer/data/x509/server_key.pem | 0 .../boomer/grpc/messager/messager.pb.go | 30 +++++++++++-------- .../boomer/grpc/messager/messager_grpc.pb.go | 6 ++-- .../boomer/grpc/proto/messager.proto | 0 hrp/{internal => pkg}/boomer/message.go | 0 hrp/{internal => pkg}/boomer/message_test.go | 0 hrp/{internal => pkg}/boomer/output.go | 0 hrp/{internal => pkg}/boomer/output_test.go | 0 hrp/{internal => pkg}/boomer/ratelimiter.go | 0 .../boomer/ratelimiter_test.go | 0 hrp/{internal => pkg}/boomer/runner.go | 2 +- hrp/{internal => pkg}/boomer/runner_test.go | 5 ++-- hrp/{internal => pkg}/boomer/server_grpc.go | 6 ++-- .../boomer/server_grpc_test.go | 0 hrp/{internal => pkg}/boomer/stats.go | 0 hrp/{internal => pkg}/boomer/stats_test.go | 1 - hrp/{internal => pkg}/boomer/task.go | 0 hrp/{internal => pkg}/boomer/ulimit.go | 0 .../boomer/ulimit_windows.go | 0 hrp/{internal => pkg}/boomer/utils.go | 1 - hrp/{internal => pkg}/boomer/utils_test.go | 1 - hrp/server.go | 2 +- 41 files changed, 41 insertions(+), 38 deletions(-) rename hrp/{internal => pkg}/boomer/README.md (100%) rename hrp/{internal => pkg}/boomer/boomer.go (100%) rename hrp/{internal => pkg}/boomer/boomer_test.go (100%) rename hrp/{internal => pkg}/boomer/client_grpc.go (96%) rename hrp/{internal => pkg}/boomer/client_grpc_test.go (100%) rename hrp/{internal => pkg}/boomer/data/data.go (99%) rename hrp/{internal => pkg}/boomer/data/x509/README.md (100%) rename hrp/{internal => pkg}/boomer/data/x509/ca_cert.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/ca_key.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/client_ca_cert.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/client_ca_key.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/client_cert.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/client_key.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/create.sh (100%) rename hrp/{internal => pkg}/boomer/data/x509/openssl.cnf (100%) rename hrp/{internal => pkg}/boomer/data/x509/server_cert.pem (100%) rename hrp/{internal => pkg}/boomer/data/x509/server_key.pem (100%) rename hrp/{internal => pkg}/boomer/grpc/messager/messager.pb.go (96%) rename hrp/{internal => pkg}/boomer/grpc/messager/messager_grpc.pb.go (99%) rename hrp/{internal => pkg}/boomer/grpc/proto/messager.proto (100%) rename hrp/{internal => pkg}/boomer/message.go (100%) rename hrp/{internal => pkg}/boomer/message_test.go (100%) rename hrp/{internal => pkg}/boomer/output.go (100%) rename hrp/{internal => pkg}/boomer/output_test.go (100%) rename hrp/{internal => pkg}/boomer/ratelimiter.go (100%) rename hrp/{internal => pkg}/boomer/ratelimiter_test.go (100%) rename hrp/{internal => pkg}/boomer/runner.go (99%) rename hrp/{internal => pkg}/boomer/runner_test.go (99%) rename hrp/{internal => pkg}/boomer/server_grpc.go (99%) rename hrp/{internal => pkg}/boomer/server_grpc_test.go (100%) rename hrp/{internal => pkg}/boomer/stats.go (100%) rename hrp/{internal => pkg}/boomer/stats_test.go (99%) rename hrp/{internal => pkg}/boomer/task.go (100%) rename hrp/{internal => pkg}/boomer/ulimit.go (100%) rename hrp/{internal => pkg}/boomer/ulimit_windows.go (100%) rename hrp/{internal => pkg}/boomer/utils.go (99%) rename hrp/{internal => pkg}/boomer/utils_test.go (99%) diff --git a/hrp/boomer.go b/hrp/boomer.go index c7d56bb6..a1d36aac 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -13,10 +13,10 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/net/context" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" ) func NewStandaloneBoomer(spawnCount int64, spawnRate float64) *HRPBoomer { diff --git a/hrp/cmd/boom.go b/hrp/cmd/boom.go index afe10253..d5f853f4 100644 --- a/hrp/cmd/boom.go +++ b/hrp/cmd/boom.go @@ -10,8 +10,8 @@ import ( "golang.org/x/net/context" "github.com/httprunner/httprunner/v4/hrp" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" ) // boomCmd represents the boom command diff --git a/hrp/cmd/curl.go b/hrp/cmd/curl.go index 214c880d..bd03aeec 100644 --- a/hrp/cmd/curl.go +++ b/hrp/cmd/curl.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v4/hrp" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer" "github.com/httprunner/httprunner/v4/hrp/internal/convert" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" ) var runCurlCmd = &cobra.Command{ diff --git a/hrp/internal/boomer/README.md b/hrp/pkg/boomer/README.md similarity index 100% rename from hrp/internal/boomer/README.md rename to hrp/pkg/boomer/README.md diff --git a/hrp/internal/boomer/boomer.go b/hrp/pkg/boomer/boomer.go similarity index 100% rename from hrp/internal/boomer/boomer.go rename to hrp/pkg/boomer/boomer.go index cdf8e708..baac35e3 100644 --- a/hrp/internal/boomer/boomer.go +++ b/hrp/pkg/boomer/boomer.go @@ -1,8 +1,6 @@ package boomer import ( - "github.com/httprunner/httprunner/v4/hrp/internal/json" - "golang.org/x/net/context" "math" "os" "os/signal" @@ -11,6 +9,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "golang.org/x/net/context" + + "github.com/httprunner/httprunner/v4/hrp/internal/json" ) // Mode is the running mode of boomer, both standalone and distributed are supported. @@ -156,7 +157,6 @@ func NewWorkerBoomer(masterHost string, masterPort int) *Boomer { // SetAutoStart auto start to load testing func (b *Boomer) SetAutoStart() { b.masterRunner.autoStart = true - } // RunMaster start to run master runner diff --git a/hrp/internal/boomer/boomer_test.go b/hrp/pkg/boomer/boomer_test.go similarity index 100% rename from hrp/internal/boomer/boomer_test.go rename to hrp/pkg/boomer/boomer_test.go diff --git a/hrp/internal/boomer/client_grpc.go b/hrp/pkg/boomer/client_grpc.go similarity index 96% rename from hrp/internal/boomer/client_grpc.go rename to hrp/pkg/boomer/client_grpc.go index 82d4241b..67484003 100644 --- a/hrp/internal/boomer/client_grpc.go +++ b/hrp/pkg/boomer/client_grpc.go @@ -8,6 +8,8 @@ import ( "sync/atomic" "time" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" "golang.org/x/oauth2" "google.golang.org/grpc" "google.golang.org/grpc/backoff" @@ -15,10 +17,8 @@ import ( "google.golang.org/grpc/credentials/oauth" "google.golang.org/grpc/metadata" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/data" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/grpc/messager" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/data" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/grpc/messager" ) type grpcClient struct { @@ -247,7 +247,7 @@ func (c *grpcClient) recv() { msg, err := c.config.getBiStreamClient().Recv() if err != nil { time.Sleep(1 * time.Second) - //log.Error().Err(err).Msg("failed to get message") + // log.Error().Err(err).Msg("failed to get message") continue } if msg == nil { @@ -317,7 +317,7 @@ func (c *grpcClient) sendMessage(msg *genericMessage) { atomic.StoreInt32(&c.failCount, 0) return } - //log.Error().Err(err).Interface("genericMessage", *msg).Msg("failed to send message") + // log.Error().Err(err).Interface("genericMessage", *msg).Msg("failed to send message") if msg.Type == "heartbeat" { atomic.AddInt32(&c.failCount, 1) } diff --git a/hrp/internal/boomer/client_grpc_test.go b/hrp/pkg/boomer/client_grpc_test.go similarity index 100% rename from hrp/internal/boomer/client_grpc_test.go rename to hrp/pkg/boomer/client_grpc_test.go diff --git a/hrp/internal/boomer/data/data.go b/hrp/pkg/boomer/data/data.go similarity index 99% rename from hrp/internal/boomer/data/data.go rename to hrp/pkg/boomer/data/data.go index 9e0a21ea..bdb1f48c 100644 --- a/hrp/internal/boomer/data/data.go +++ b/hrp/pkg/boomer/data/data.go @@ -38,7 +38,6 @@ func init() { } hrpPath = filepath.Join(home, ".hrp") _ = builtin.EnsureFolderExists(filepath.Join(hrpPath, "x509")) - } // Path returns the absolute path the given relative file or directory path diff --git a/hrp/internal/boomer/data/x509/README.md b/hrp/pkg/boomer/data/x509/README.md similarity index 100% rename from hrp/internal/boomer/data/x509/README.md rename to hrp/pkg/boomer/data/x509/README.md diff --git a/hrp/internal/boomer/data/x509/ca_cert.pem b/hrp/pkg/boomer/data/x509/ca_cert.pem similarity index 100% rename from hrp/internal/boomer/data/x509/ca_cert.pem rename to hrp/pkg/boomer/data/x509/ca_cert.pem diff --git a/hrp/internal/boomer/data/x509/ca_key.pem b/hrp/pkg/boomer/data/x509/ca_key.pem similarity index 100% rename from hrp/internal/boomer/data/x509/ca_key.pem rename to hrp/pkg/boomer/data/x509/ca_key.pem diff --git a/hrp/internal/boomer/data/x509/client_ca_cert.pem b/hrp/pkg/boomer/data/x509/client_ca_cert.pem similarity index 100% rename from hrp/internal/boomer/data/x509/client_ca_cert.pem rename to hrp/pkg/boomer/data/x509/client_ca_cert.pem diff --git a/hrp/internal/boomer/data/x509/client_ca_key.pem b/hrp/pkg/boomer/data/x509/client_ca_key.pem similarity index 100% rename from hrp/internal/boomer/data/x509/client_ca_key.pem rename to hrp/pkg/boomer/data/x509/client_ca_key.pem diff --git a/hrp/internal/boomer/data/x509/client_cert.pem b/hrp/pkg/boomer/data/x509/client_cert.pem similarity index 100% rename from hrp/internal/boomer/data/x509/client_cert.pem rename to hrp/pkg/boomer/data/x509/client_cert.pem diff --git a/hrp/internal/boomer/data/x509/client_key.pem b/hrp/pkg/boomer/data/x509/client_key.pem similarity index 100% rename from hrp/internal/boomer/data/x509/client_key.pem rename to hrp/pkg/boomer/data/x509/client_key.pem diff --git a/hrp/internal/boomer/data/x509/create.sh b/hrp/pkg/boomer/data/x509/create.sh similarity index 100% rename from hrp/internal/boomer/data/x509/create.sh rename to hrp/pkg/boomer/data/x509/create.sh diff --git a/hrp/internal/boomer/data/x509/openssl.cnf b/hrp/pkg/boomer/data/x509/openssl.cnf similarity index 100% rename from hrp/internal/boomer/data/x509/openssl.cnf rename to hrp/pkg/boomer/data/x509/openssl.cnf diff --git a/hrp/internal/boomer/data/x509/server_cert.pem b/hrp/pkg/boomer/data/x509/server_cert.pem similarity index 100% rename from hrp/internal/boomer/data/x509/server_cert.pem rename to hrp/pkg/boomer/data/x509/server_cert.pem diff --git a/hrp/internal/boomer/data/x509/server_key.pem b/hrp/pkg/boomer/data/x509/server_key.pem similarity index 100% rename from hrp/internal/boomer/data/x509/server_key.pem rename to hrp/pkg/boomer/data/x509/server_key.pem diff --git a/hrp/internal/boomer/grpc/messager/messager.pb.go b/hrp/pkg/boomer/grpc/messager/messager.pb.go similarity index 96% rename from hrp/internal/boomer/grpc/messager/messager.pb.go rename to hrp/pkg/boomer/grpc/messager/messager.pb.go index 66a20108..3ad177c5 100644 --- a/hrp/internal/boomer/grpc/messager/messager.pb.go +++ b/hrp/pkg/boomer/grpc/messager/messager.pb.go @@ -7,10 +7,11 @@ package messager import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -458,17 +459,20 @@ func file_grpc_proto_messager_proto_rawDescGZIP() []byte { return file_grpc_proto_messager_proto_rawDescData } -var file_grpc_proto_messager_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_grpc_proto_messager_proto_goTypes = []interface{}{ - (*StreamRequest)(nil), // 0: message.StreamRequest - (*StreamResponse)(nil), // 1: message.StreamResponse - (*RegisterRequest)(nil), // 2: message.RegisterRequest - (*RegisterResponse)(nil), // 3: message.RegisterResponse - (*SignOutRequest)(nil), // 4: message.SignOutRequest - (*SignOutResponse)(nil), // 5: message.SignOutResponse - nil, // 6: message.StreamRequest.DataEntry - nil, // 7: message.StreamResponse.DataEntry -} +var ( + file_grpc_proto_messager_proto_msgTypes = make([]protoimpl.MessageInfo, 8) + file_grpc_proto_messager_proto_goTypes = []interface{}{ + (*StreamRequest)(nil), // 0: message.StreamRequest + (*StreamResponse)(nil), // 1: message.StreamResponse + (*RegisterRequest)(nil), // 2: message.RegisterRequest + (*RegisterResponse)(nil), // 3: message.RegisterResponse + (*SignOutRequest)(nil), // 4: message.SignOutRequest + (*SignOutResponse)(nil), // 5: message.SignOutResponse + nil, // 6: message.StreamRequest.DataEntry + nil, // 7: message.StreamResponse.DataEntry + } +) + var file_grpc_proto_messager_proto_depIdxs = []int32{ 6, // 0: message.StreamRequest.data:type_name -> message.StreamRequest.DataEntry 7, // 1: message.StreamResponse.data:type_name -> message.StreamResponse.DataEntry diff --git a/hrp/internal/boomer/grpc/messager/messager_grpc.pb.go b/hrp/pkg/boomer/grpc/messager/messager_grpc.pb.go similarity index 99% rename from hrp/internal/boomer/grpc/messager/messager_grpc.pb.go rename to hrp/pkg/boomer/grpc/messager/messager_grpc.pb.go index b4bbad60..80e1a6b5 100644 --- a/hrp/internal/boomer/grpc/messager/messager_grpc.pb.go +++ b/hrp/pkg/boomer/grpc/messager/messager_grpc.pb.go @@ -8,6 +8,7 @@ package messager import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -95,15 +96,16 @@ type MessageServer interface { } // UnimplementedMessageServer must be embedded to have forward compatible implementations. -type UnimplementedMessageServer struct { -} +type UnimplementedMessageServer struct{} func (UnimplementedMessageServer) Register(context.Context, *RegisterRequest) (*RegisterResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Register not implemented") } + func (UnimplementedMessageServer) SignOut(context.Context, *SignOutRequest) (*SignOutResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SignOut not implemented") } + func (UnimplementedMessageServer) BidirectionalStreamingMessage(Message_BidirectionalStreamingMessageServer) error { return status.Errorf(codes.Unimplemented, "method BidirectionalStreamingMessage not implemented") } diff --git a/hrp/internal/boomer/grpc/proto/messager.proto b/hrp/pkg/boomer/grpc/proto/messager.proto similarity index 100% rename from hrp/internal/boomer/grpc/proto/messager.proto rename to hrp/pkg/boomer/grpc/proto/messager.proto diff --git a/hrp/internal/boomer/message.go b/hrp/pkg/boomer/message.go similarity index 100% rename from hrp/internal/boomer/message.go rename to hrp/pkg/boomer/message.go diff --git a/hrp/internal/boomer/message_test.go b/hrp/pkg/boomer/message_test.go similarity index 100% rename from hrp/internal/boomer/message_test.go rename to hrp/pkg/boomer/message_test.go diff --git a/hrp/internal/boomer/output.go b/hrp/pkg/boomer/output.go similarity index 100% rename from hrp/internal/boomer/output.go rename to hrp/pkg/boomer/output.go diff --git a/hrp/internal/boomer/output_test.go b/hrp/pkg/boomer/output_test.go similarity index 100% rename from hrp/internal/boomer/output_test.go rename to hrp/pkg/boomer/output_test.go diff --git a/hrp/internal/boomer/ratelimiter.go b/hrp/pkg/boomer/ratelimiter.go similarity index 100% rename from hrp/internal/boomer/ratelimiter.go rename to hrp/pkg/boomer/ratelimiter.go diff --git a/hrp/internal/boomer/ratelimiter_test.go b/hrp/pkg/boomer/ratelimiter_test.go similarity index 100% rename from hrp/internal/boomer/ratelimiter_test.go rename to hrp/pkg/boomer/ratelimiter_test.go diff --git a/hrp/internal/boomer/runner.go b/hrp/pkg/boomer/runner.go similarity index 99% rename from hrp/internal/boomer/runner.go rename to hrp/pkg/boomer/runner.go index 4bde3a03..d9e5d5f4 100644 --- a/hrp/internal/boomer/runner.go +++ b/hrp/pkg/boomer/runner.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/grpc/messager" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/grpc/messager" ) const ( diff --git a/hrp/internal/boomer/runner_test.go b/hrp/pkg/boomer/runner_test.go similarity index 99% rename from hrp/internal/boomer/runner_test.go rename to hrp/pkg/boomer/runner_test.go index 62d772d5..76b44cfa 100644 --- a/hrp/internal/boomer/runner_test.go +++ b/hrp/pkg/boomer/runner_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/grpc/messager" - "github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/stretchr/testify/assert" + + "github.com/httprunner/httprunner/v4/hrp/internal/builtin" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/grpc/messager" ) type HitOutput struct { diff --git a/hrp/internal/boomer/server_grpc.go b/hrp/pkg/boomer/server_grpc.go similarity index 99% rename from hrp/internal/boomer/server_grpc.go rename to hrp/pkg/boomer/server_grpc.go index 2a9c9d00..f795cac5 100644 --- a/hrp/internal/boomer/server_grpc.go +++ b/hrp/pkg/boomer/server_grpc.go @@ -9,6 +9,7 @@ import ( "sync/atomic" "time" + "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" @@ -17,9 +18,8 @@ import ( "google.golang.org/grpc/reflection" "google.golang.org/grpc/status" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/data" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer/grpc/messager" - "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/data" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer/grpc/messager" ) type WorkerNode struct { diff --git a/hrp/internal/boomer/server_grpc_test.go b/hrp/pkg/boomer/server_grpc_test.go similarity index 100% rename from hrp/internal/boomer/server_grpc_test.go rename to hrp/pkg/boomer/server_grpc_test.go diff --git a/hrp/internal/boomer/stats.go b/hrp/pkg/boomer/stats.go similarity index 100% rename from hrp/internal/boomer/stats.go rename to hrp/pkg/boomer/stats.go diff --git a/hrp/internal/boomer/stats_test.go b/hrp/pkg/boomer/stats_test.go similarity index 99% rename from hrp/internal/boomer/stats_test.go rename to hrp/pkg/boomer/stats_test.go index 1d4806a2..4a8491ca 100644 --- a/hrp/internal/boomer/stats_test.go +++ b/hrp/pkg/boomer/stats_test.go @@ -110,7 +110,6 @@ func TestLogError(t *testing.T) { if err400.occurrences != 2 { t.Error("Error occurrences is wrong, expected: 2, got:", err400.occurrences) } - } func BenchmarkLogError(b *testing.B) { diff --git a/hrp/internal/boomer/task.go b/hrp/pkg/boomer/task.go similarity index 100% rename from hrp/internal/boomer/task.go rename to hrp/pkg/boomer/task.go diff --git a/hrp/internal/boomer/ulimit.go b/hrp/pkg/boomer/ulimit.go similarity index 100% rename from hrp/internal/boomer/ulimit.go rename to hrp/pkg/boomer/ulimit.go diff --git a/hrp/internal/boomer/ulimit_windows.go b/hrp/pkg/boomer/ulimit_windows.go similarity index 100% rename from hrp/internal/boomer/ulimit_windows.go rename to hrp/pkg/boomer/ulimit_windows.go diff --git a/hrp/internal/boomer/utils.go b/hrp/pkg/boomer/utils.go similarity index 99% rename from hrp/internal/boomer/utils.go rename to hrp/pkg/boomer/utils.go index 94fad13b..f10a90d0 100644 --- a/hrp/internal/boomer/utils.go +++ b/hrp/pkg/boomer/utils.go @@ -11,7 +11,6 @@ import ( "time" "github.com/google/uuid" - "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/mem" diff --git a/hrp/internal/boomer/utils_test.go b/hrp/pkg/boomer/utils_test.go similarity index 99% rename from hrp/internal/boomer/utils_test.go rename to hrp/pkg/boomer/utils_test.go index c56d1457..a8448a97 100644 --- a/hrp/internal/boomer/utils_test.go +++ b/hrp/pkg/boomer/utils_test.go @@ -32,7 +32,6 @@ func TestRound(t *testing.T) { if roundOne != roundTwo { t.Error("round(58360) should be equal to round(58460)") } - } func TestGenMD5(t *testing.T) { diff --git a/hrp/server.go b/hrp/server.go index 50d9d590..ab2417a6 100644 --- a/hrp/server.go +++ b/hrp/server.go @@ -11,8 +11,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/httprunner/httprunner/v4/hrp/internal/boomer" "github.com/httprunner/httprunner/v4/hrp/internal/json" + "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" ) const jsonContentType = "application/json; encoding=utf-8"