Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a swich for append to stdout #463

Merged
merged 2 commits into from
May 17, 2022
Merged

a swich for append to stdout #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95860af
use github.com/pkg/errors
robberphex May 16, 2022
ae19dbf
switch for append to stdout
robberphex May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/cache/disk_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"os"
"strconv"

"github.com/go-errors/errors"
"github.com/nacos-group/nacos-sdk-go/v2/common/file"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
"github.com/nacos-group/nacos-sdk-go/v2/model"
"github.com/nacos-group/nacos-sdk-go/v2/util"
"github.com/pkg/errors"
)

func GetFileName(cacheKey string, cacheDir string) string {
Expand Down
2 changes: 1 addition & 1 deletion clients/client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package clients

import (
"errors"
"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"

Expand Down
3 changes: 2 additions & 1 deletion clients/config_client/config_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
package config_client

import (
"errors"
"fmt"
"math"
"os"
"strings"
"sync"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"

"github.com/aliyun/alibaba-cloud-sdk-go/services/kms"
Expand Down
3 changes: 2 additions & 1 deletion clients/config_client/config_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ package config_client

import (
"encoding/json"
"errors"
"net/http"
"strconv"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"

"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc"
Expand Down
3 changes: 2 additions & 1 deletion clients/nacos_client/nacos_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
package nacos_client

import (
"errors"
"log"
"os"
"strconv"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
"github.com/nacos-group/nacos-sdk-go/v2/common/file"
"github.com/nacos-group/nacos-sdk-go/v2/common/http_agent"
Expand Down
3 changes: 2 additions & 1 deletion clients/naming_client/naming_cache/subscribe_callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package naming_cache

import (
"errors"
"sync"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/clients/cache"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
"github.com/nacos-group/nacos-sdk-go/v2/model"
Expand Down
3 changes: 2 additions & 1 deletion clients/naming_client/naming_http/beat_reactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ package naming_http

import (
"context"
"errors"
"fmt"
"net/http"
"strconv"
"sync"
"sync/atomic"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"

"github.com/buger/jsonparser"
Expand Down
3 changes: 2 additions & 1 deletion clients/naming_client/naming_http/naming_http_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
package naming_http

import (
"errors"
"fmt"
"net/http"
"strconv"
"time"

"github.com/pkg/errors"

"github.com/buger/jsonparser"

"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client/naming_cache"
Expand Down
1 change: 1 addition & 0 deletions common/constant/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type ClientConfig struct {
LogDir string // the directory for log, default is current path
LogLevel string // the level of log, it's must be debug,info,warn,error, default value is info
ContextPath string // the nacos server contextpath
AppendToStdout bool // if append log to stdout
SpecialYang marked this conversation as resolved.
Show resolved Hide resolved
LogSampling *ClientLogSamplingConfig // the sampling config of log
LogRollingConfig *ClientLogRollingConfig // log rolling config
TLSCfg TLSConfig // tls Config
Expand Down
2 changes: 1 addition & 1 deletion common/http_agent/http_agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
"github.com/nacos-group/nacos-sdk-go/v2/common/tls"

"github.com/go-errors/errors"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
"github.com/nacos-group/nacos-sdk-go/v2/util"
"github.com/pkg/errors"
)

type HttpAgent struct {
Expand Down
10 changes: 7 additions & 3 deletions common/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ var levelMap = map[string]zapcore.Level{
type Config struct {
Level string
Sampling *SamplingConfig
AppendToStdout bool
LogRollingConfig *lumberjack.Logger
}

Expand Down Expand Up @@ -89,7 +90,8 @@ func init() {

func BuildLoggerConfig(clientConfig constant.ClientConfig) Config {
loggerConfig := Config{
Level: clientConfig.LogLevel,
Level: clientConfig.LogLevel,
AppendToStdout: clientConfig.AppendToStdout,
}
if clientConfig.LogSampling != nil {
loggerConfig.Sampling = &SamplingConfig{
Expand Down Expand Up @@ -125,8 +127,10 @@ func InitNacosLogger(config Config) (Logger, error) {
logLevel := getLogLevel(config.Level)
encoder := getEncoder()
writer := config.getLogWriter()
core := zapcore.NewCore(zapcore.NewConsoleEncoder(encoder),
zapcore.NewMultiWriteSyncer(writer, zapcore.AddSync(os.Stdout)), logLevel)
if config.AppendToStdout {
writer = zapcore.NewMultiWriteSyncer(writer, zapcore.AddSync(os.Stdout))
}
core := zapcore.NewCore(zapcore.NewConsoleEncoder(encoder), writer, logLevel)
zaplogger := zap.New(core, zap.AddCaller(), zap.AddCallerSkip(1))
return &NacosLogger{zaplogger.Sugar()}, nil
}
Expand Down
15 changes: 8 additions & 7 deletions common/nacos_server/nacos_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"crypto/hmac"
"crypto/sha1"
"encoding/base64"
"errors"
"fmt"
"io/ioutil"
"math/rand"
Expand All @@ -32,6 +31,8 @@ import (
"sync/atomic"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_request"

"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"
Expand Down Expand Up @@ -209,7 +210,6 @@ func (server *NacosServer) ReqConfigApi(api string, params map[string]string, he
}
logger.Errorf("api<%s>,method:<%s>, params:<%s>, call domain error:<%+v> , result:<%s>", api, method, util.ToJsonString(params), err, result)
}
return "", err
} else {
index := rand.Intn(len(srvs))
for i := 1; i <= len(srvs); i++ {
Expand All @@ -221,8 +221,8 @@ func (server *NacosServer) ReqConfigApi(api string, params map[string]string, he
logger.Errorf("[ERROR] api<%s>,method:<%s>, params:<%s>, call domain error:<%+v> , result:<%s> \n", api, method, util.ToJsonString(params), err, result)
index = (index + i) % len(srvs)
}
return "", err
}
return "", errors.Wrapf(err, "retry %d times request failed!", constant.REQUEST_DOMAIN_RETRY_TIME)
}

func (server *NacosServer) ReqApi(api string, params map[string]string, method string) (string, error) {
Expand All @@ -234,28 +234,29 @@ func (server *NacosServer) ReqApi(api string, params map[string]string, method s
server.InjectSecurityInfo(params)

//only one server,retry request when error
var err error
var result string
if len(srvs) == 1 {
for i := 0; i < constant.REQUEST_DOMAIN_RETRY_TIME; i++ {
result, err := server.callServer(api, params, method, getAddress(srvs[0]), srvs[0].ContextPath)
result, err = server.callServer(api, params, method, getAddress(srvs[0]), srvs[0].ContextPath)
if err == nil {
return result, nil
}
logger.Errorf("api<%s>,method:<%s>, params:<%s>, call domain error:<%+v> , result:<%s>", api, method, util.ToJsonString(params), err, result)
}
return "", errors.New("retry " + strconv.Itoa(constant.REQUEST_DOMAIN_RETRY_TIME) + " times request failed!")
} else {
index := rand.Intn(len(srvs))
for i := 1; i <= len(srvs); i++ {
curServer := srvs[index]
result, err := server.callServer(api, params, method, getAddress(curServer), curServer.ContextPath)
result, err = server.callServer(api, params, method, getAddress(curServer), curServer.ContextPath)
if err == nil {
return result, nil
}
logger.Errorf("api<%s>,method:<%s>, params:<%s>, call domain error:<%+v> , result:<%s>", api, method, util.ToJsonString(params), err, result)
index = (index + i) % len(srvs)
}
return "", errors.New("retry " + strconv.Itoa(constant.REQUEST_DOMAIN_RETRY_TIME) + " times request failed!")
}
return "", errors.Wrapf(err, "retry %d times request failed!", constant.REQUEST_DOMAIN_RETRY_TIME)
}

func (server *NacosServer) initRefreshSrvIfNeed() {
Expand Down
3 changes: 2 additions & 1 deletion common/remote/rpc/grpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ package rpc
import (
"context"
"encoding/json"
"errors"
"io"
"os"
"strconv"
"sync"
"sync/atomic"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_request"
"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_response"

Expand Down
3 changes: 2 additions & 1 deletion common/remote/rpc/grpc_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package rpc
import (
"context"
"encoding/json"
"errors"
"fmt"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_request"
"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_response"

Expand Down
6 changes: 3 additions & 3 deletions common/remote/rpc/rpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
package rpc

import (
"errors"
"fmt"
"math"
"reflect"
"sync"
"sync/atomic"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
"github.com/nacos-group/nacos-sdk-go/v2/common/nacos_server"
Expand Down Expand Up @@ -471,7 +471,7 @@ func (r *RpcClient) Request(request rpc_request.IRequest, timeoutMills int64) (r
for retryTimes < constant.REQUEST_DOMAIN_RETRY_TIME && util.CurrentMillis() < start+timeoutMills {
if r.currentConnection == nil || !r.IsRunning() {
currentErr = waitReconnect(timeoutMills, &retryTimes, request,
fmt.Errorf("client not connected, current status:%s", r.rpcClientStatus.getDesc()))
errors.Errorf("client not connected, current status:%s", r.rpcClientStatus.getDesc()))
continue
}
response, err := r.currentConnection.request(request, timeoutMills, r)
Expand Down
3 changes: 2 additions & 1 deletion common/security/security_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ package security

import (
"encoding/json"
"errors"
"io/ioutil"
"net/http"
"strconv"
"strings"
"sync/atomic"
"time"

"github.com/pkg/errors"

"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
"github.com/nacos-group/nacos-sdk-go/v2/common/http_agent"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.14
require (
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18
github.com/buger/jsonparser v1.1.1
github.com/go-errors/errors v1.0.1
github.com/golang/mock v1.3.1
github.com/golang/protobuf v1.4.3
github.com/pkg/errors v0.9.1
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
Expand Down