Skip to content

Commit 6e446d6

Browse files
pemakopemako
committed
feat:change nil != err to err != nil
1 parent af00726 commit 6e446d6

File tree

101 files changed

+442
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+442
-442
lines changed

‎api/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cfg.GetGlobal().GetSystem().GetHealthCheckCluster().SetService("polaris.monitor"
2727
假如需要修改北极星的日志打印目录，可以按照以下方式进行修改
2828

2929
```go
30-
if err := api.SetLoggersDir("/tmp/polaris/log"); nil != err {
30+
if err := api.SetLoggersDir("/tmp/polaris/log"); err != nil {
3131
//do error handle
3232
}
3333
```
@@ -37,7 +37,7 @@ if err := api.SetLoggersDir("/tmp/polaris/log"); nil != err {
3737
假如需要修改北极星的日志打印级别，可以按照以下方式进行修改
3838

3939
```go
40-
if err := api.SetLoggersLevel(api.InfoLog); nil != err {
40+
if err := api.SetLoggersLevel(api.InfoLog); err != nil {
4141
//do error handle
4242
}
4343
```
@@ -49,7 +49,7 @@ if err := api.SetLoggersLevel(api.InfoLog); nil != err {
4949
polaris-go启动后，默认会在程序运行的当前目录创建polaris/log目录，用于存放运行过程中的日志。因此用户需要保证当前目录有写权限 假如需要修改北极星的日志打印目录以及日志级别，可以按照以下方式进行修改
5050

5151
```go
52-
if err := api.ConfigLoggers("/tmp/polaris/log", api.InfoLog); nil != err {
52+
if err := api.ConfigLoggers("/tmp/polaris/log", api.InfoLog); err != nil {
5353
//do error handle
5454
}
5555
```

‎api/config.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ func (s *sdkContext) Destroy() {
119119
var err error
120120
atomic.StoreUint32(&s.destroyed, 1)
121121
err = s.engine.Destroy()
122-
if nil != err {
122+
if err != nil {
123123
log.GetBaseLogger().Errorf("fail to destroy engine, error %+v", err)
124124
}
125125
err = s.plugins.DestroyPlugins()
126-
if nil != err {
126+
if err != nil {
127127
log.GetBaseLogger().Errorf("fail to destroy plugins, error %+v", err)
128128
}
129129
}
@@ -159,7 +159,7 @@ func InitContextByFile(path string) (SDKContext, error) {
159159
return nil, model.NewSDKError(model.ErrCodeAPIInvalidArgument, nil, "invalid context file %s", path)
160160
}
161161
buff, err := ioutil.ReadFile(path)
162-
if nil != err {
162+
if err != nil {
163163
return nil, model.NewSDKError(model.ErrCodeAPIInvalidArgument, err, "fail to read context file %s", path)
164164
}
165165
return InitContextByStream(buff)
@@ -168,7 +168,7 @@ func InitContextByFile(path string) (SDKContext, error) {
168168
// InitContextByStream 通过YAML流新建服务消费者配置
169169
func InitContextByStream(buf []byte) (SDKContext, error) {
170170
cfg, err := config.LoadConfiguration(buf)
171-
if nil != err {
171+
if err != nil {
172172
return nil, err
173173
}
174174
return InitContextByConfig(cfg)
@@ -180,35 +180,35 @@ func checkLoggersDir() error {
180180
var err error
181181
if l, ok := log.GetBaseLogger().(log.DirLogger); ok && !l.IsLevelEnabled(log.NoneLog) {
182182
err = model.EnsureAndVerifyDir(l.GetLogDir())
183-
if nil != err {
183+
if err != nil {
184184
errs = multierror.Append(errs, multierror.Prefix(err,
185185
fmt.Sprintf("fail to create base logger dir: %s", l.GetLogDir())))
186186
}
187187
}
188188
if l, ok := log.GetDetectLogger().(log.DirLogger); ok && !l.IsLevelEnabled(log.NoneLog) {
189189
err = model.EnsureAndVerifyDir(l.GetLogDir())
190-
if nil != err {
190+
if err != nil {
191191
errs = multierror.Append(errs, multierror.Prefix(err,
192192
fmt.Sprintf("fail to create detect logger dir: %s", l.GetLogDir())))
193193
}
194194
}
195195
if l, ok := log.GetStatLogger().(log.DirLogger); ok && !l.IsLevelEnabled(log.NoneLog) {
196196
err = model.EnsureAndVerifyDir(l.GetLogDir())
197-
if nil != err {
197+
if err != nil {
198198
errs = multierror.Append(errs, multierror.Prefix(err,
199199
fmt.Sprintf("fail to create stat logger dir: %s", l.GetLogDir())))
200200
}
201201
}
202202
if l, ok := log.GetStatReportLogger().(log.DirLogger); ok && !l.IsLevelEnabled(log.NoneLog) {
203203
err = model.EnsureAndVerifyDir(l.GetLogDir())
204-
if nil != err {
204+
if err != nil {
205205
errs = multierror.Append(errs, multierror.Prefix(err,
206206
fmt.Sprintf("fail to create statReport logger dir: %s", l.GetLogDir())))
207207
}
208208
}
209209
if l, ok := log.GetNetworkLogger().(log.DirLogger); ok && !l.IsLevelEnabled(log.NoneLog) {
210210
err = model.EnsureAndVerifyDir(l.GetLogDir())
211-
if nil != err {
211+
if err != nil {
212212
errs = multierror.Append(errs, multierror.Prefix(err,
213213
fmt.Sprintf("fail to create network logger dir: %s", l.GetLogDir())))
214214
}
@@ -246,14 +246,14 @@ func InitContextByConfig(cfg config.Configuration) (SDKContext, error) {
246246
}
247247
if log.GetBaseLogger().IsLevelEnabled(log.DebugLog) {
248248
text, err := yaml.Marshal(cfg)
249-
if nil != err {
249+
if err != nil {
250250
return nil, model.NewSDKError(model.ErrCodeAPIInvalidConfig, err, "fail to marshal input config")
251251
}
252252
log.GetBaseLogger().Debugf("Input config:\n%s", string(text))
253253
}
254254

255255
cfg.SetDefault()
256-
if err := cfg.Verify(); nil != err {
256+
if err := cfg.Verify(); err != nil {
257257
return nil, model.NewSDKError(model.ErrCodeAPIInvalidConfig, err, "fail to verify input config")
258258
}
259259
token := model.SDKToken{
@@ -272,7 +272,7 @@ func InitContextByConfig(cfg config.Configuration) (SDKContext, error) {
272272
plugManager := plugin.NewPluginManager()
273273
globalCtx.SetValue(model.ContextKeyPlugins, plugManager)
274274
connManager, err := network.NewConnectionManager(cfg, globalCtx)
275-
if nil != err {
275+
if err != nil {
276276
return nil, model.NewSDKError(model.ErrCodeAPIInvalidConfig, err, "fail to create connectionManager")
277277
}
278278
initCtx := plugin.InitContext{Config: cfg, Plugins: plugManager, ValueCtx: globalCtx, ConnManager: connManager,
@@ -304,12 +304,12 @@ func InitContextByConfig(cfg config.Configuration) (SDKContext, error) {
304304
return nil, err
305305
}
306306
err = engine.Start()
307-
if nil != err {
307+
if err != nil {
308308
return nil, err
309309
}
310310
log.GetBaseLogger().Infof("\n-------%s, All plugins and engine started successfully-------", token.UID)
311311
ctx := &sdkContext{config: cfg, plugins: plugManager, engine: engine, valueContext: globalCtx}
312-
if err = onContextInitialized(ctx); nil != err {
312+
if err = onContextInitialized(ctx); err != nil {
313313
ctx.Destroy()
314314
return nil, err
315315
}
@@ -326,7 +326,7 @@ func onContextInitialized(ctx SDKContext) error {
326326
EventType: common.OnContextStarted, EventObject: ctx}
327327
for _, handler := range eventHandlers {
328328
err := handler.Callback(event)
329-
if nil != err {
329+
if err != nil {
330330
return model.NewSDKError(model.ErrCodePluginError, err,
331331
"InitContextByConfig: fail to handle OnContextStarted event")
332332
}

‎api/consumer_impl.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -38,92 +38,92 @@ type consumerAPI struct {
3838

3939
// GetOneInstance sync get one instance after load balance
4040
func (c *consumerAPI) GetOneInstance(req *GetOneInstanceRequest) (*model.OneInstanceResponse, error) {
41-
if err := checkAvailable(c); nil != err {
41+
if err := checkAvailable(c); err != nil {
4242
return nil, err
4343
}
44-
if err := req.Validate(); nil != err {
44+
if err := req.Validate(); err != nil {
4545
return nil, err
4646
}
4747
return c.context.GetEngine().SyncGetOneInstance(&req.GetOneInstanceRequest)
4848
}
4949

5050
// GetInstances sync get one instances after route
5151
func (c *consumerAPI) GetInstances(req *GetInstancesRequest) (*model.InstancesResponse, error) {
52-
if err := checkAvailable(c); nil != err {
52+
if err := checkAvailable(c); err != nil {
5353
return nil, err
5454
}
55-
if err := req.Validate(); nil != err {
55+
if err := req.Validate(); err != nil {
5656
return nil, err
5757
}
5858
return c.context.GetEngine().SyncGetInstances(&req.GetInstancesRequest)
5959
}
6060

6161
// GetAllInstances 获取完整的服务列表
6262
func (c *consumerAPI) GetAllInstances(req *GetAllInstancesRequest) (*model.InstancesResponse, error) {
63-
if err := checkAvailable(c); nil != err {
63+
if err := checkAvailable(c); err != nil {
6464
return nil, err
6565
}
66-
if err := req.Validate(); nil != err {
66+
if err := req.Validate(); err != nil {
6767
return nil, err
6868
}
6969
return c.context.GetEngine().SyncGetAllInstances(&req.GetAllInstancesRequest)
7070
}
7171

7272
// UpdateServiceCallResult update the service call error code and delay
7373
func (c *consumerAPI) UpdateServiceCallResult(req *ServiceCallResult) error {
74-
if err := checkAvailable(c); nil != err {
74+
if err := checkAvailable(c); err != nil {
7575
return err
7676
}
77-
if err := req.Validate(); nil != err {
77+
if err := req.Validate(); err != nil {
7878
return err
7979
}
8080
return c.context.GetEngine().SyncUpdateServiceCallResult(&req.ServiceCallResult)
8181
}
8282

8383
// GetRouteRule 同步获取服务路由规则
8484
func (c *consumerAPI) GetRouteRule(req *GetServiceRuleRequest) (*model.ServiceRuleResponse, error) {
85-
if err := checkAvailable(c); nil != err {
85+
if err := checkAvailable(c); err != nil {
8686
return nil, err
8787
}
88-
if err := req.Validate(); nil != err {
88+
if err := req.Validate(); err != nil {
8989
return nil, err
9090
}
9191
return c.context.GetEngine().SyncGetServiceRule(model.EventRouting, &req.GetServiceRuleRequest)
9292
}
9393

9494
// GetMeshConfig 同步获取mesh配置
9595
func (c *consumerAPI) GetMeshConfig(req *GetMeshConfigRequest) (*model.MeshConfigResponse, error) {
96-
if err := checkAvailable(c); nil != err {
96+
if err := checkAvailable(c); err != nil {
9797
return nil, err
9898
}
9999
return c.context.GetEngine().SyncGetMeshConfig(model.EventMeshConfig, &req.GetMeshConfigRequest)
100100
}
101101

102102
// GetMesh 同步获取网格
103103
func (c *consumerAPI) GetMesh(req *GetMeshRequest) (*model.MeshResponse, error) {
104-
if err := checkAvailable(c); nil != err {
104+
if err := checkAvailable(c); err != nil {
105105
return nil, err
106106
}
107107
return c.context.GetEngine().SyncGetMesh(model.EventMesh, &req.GetMeshRequest)
108108
}
109109

110110
// GetServicesByBusiness 同步获取批量服务
111111
func (c *consumerAPI) GetServicesByBusiness(req *GetServicesRequest) (*model.ServicesResponse, error) {
112-
if err := checkAvailable(c); nil != err {
112+
if err := checkAvailable(c); err != nil {
113113
return nil, err
114114
}
115-
if err := req.Validate(); nil != err {
115+
if err := req.Validate(); err != nil {
116116
return nil, err
117117
}
118118
return c.context.GetEngine().SyncGetServices(model.EventServices, &req.GetServicesRequest)
119119
}
120120

121121
// InitCalleeService 初始化服务运行中需要的被调服务
122122
func (c *consumerAPI) InitCalleeService(req *InitCalleeServiceRequest) error {
123-
if err := checkAvailable(c); nil != err {
123+
if err := checkAvailable(c); err != nil {
124124
return err
125125
}
126-
if err := req.Validate(); nil != err {
126+
if err := req.Validate(); err != nil {
127127
return err
128128
}
129129
return c.context.GetEngine().InitCalleeService(&req.InitCalleeServiceRequest)
@@ -160,7 +160,7 @@ func newConsumerAPI() (ConsumerAPI, error) {
160160
// NewConsumerAPIByFile 通过配置文件创建SDK ConsumerAPI对象
161161
func newConsumerAPIByFile(path string) (ConsumerAPI, error) {
162162
context, err := InitContextByFile(path)
163-
if nil != err {
163+
if err != nil {
164164
return nil, err
165165
}
166166
return &consumerAPI{context}, nil
@@ -169,7 +169,7 @@ func newConsumerAPIByFile(path string) (ConsumerAPI, error) {
169169
// NewConsumerAPIByFile 通过配置对象创建SDK ConsumerAPI对象
170170
func newConsumerAPIByConfig(cfg config.Configuration) (ConsumerAPI, error) {
171171
context, err := InitContextByConfig(cfg)
172-
if nil != err {
172+
if err != nil {
173173
return nil, err
174174
}
175175
return &consumerAPI{context}, nil

‎api/limit_impl.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func (c *limitAPI) SDKContext() SDKContext {
3434

3535
// GetQuota 获取限流配额
3636
func (c *limitAPI) GetQuota(request QuotaRequest) (QuotaFuture, error) {
37-
if err := checkAvailable(c); nil != err {
37+
if err := checkAvailable(c); err != nil {
3838
return nil, err
3939
}
4040
mRequest := request.(*model.QuotaRequestImpl)
41-
if err := mRequest.Validate(); nil != err {
41+
if err := mRequest.Validate(); err != nil {
4242
return nil, err
4343
}
4444
return c.context.GetEngine().AsyncGetQuota(mRequest)
@@ -59,7 +59,7 @@ func newLimitAPI() (LimitAPI, error) {
5959
// newLimitAPIByConfig 通过配置对象创建SDK LimitAPI对象
6060
func newLimitAPIByConfig(cfg config.Configuration) (LimitAPI, error) {
6161
context, err := InitContextByConfig(cfg)
62-
if nil != err {
62+
if err != nil {
6363
return nil, err
6464
}
6565
return &limitAPI{context}, nil
@@ -73,7 +73,7 @@ func newLimitAPIByContext(context SDKContext) LimitAPI {
7373
// newLimitAPIByFile 通过配置文件创建SDK LimitAPI对象
7474
func newLimitAPIByFile(path string) (LimitAPI, error) {
7575
context, err := InitContextByFile(path)
76-
if nil != err {
76+
if err != nil {
7777
return nil, err
7878
}
7979
return &limitAPI{context: context}, nil

‎api/log.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,19 @@ func GetStatReportLogger() Logger {
104104
// ConfigLoggers 全局配置日志对象
105105
func ConfigLoggers(logDir string, logLevel int) error {
106106
var err error
107-
if err = ConfigBaseLogger(logDir, logLevel); nil != err {
107+
if err = ConfigBaseLogger(logDir, logLevel); err != nil {
108108
return fmt.Errorf("fail to ConfigBaseLogger: %v", err)
109109
}
110-
if err = ConfigStatLogger(logDir, logLevel); nil != err {
110+
if err = ConfigStatLogger(logDir, logLevel); err != nil {
111111
return fmt.Errorf("fail to ConfigStatLogger: %v", err)
112112
}
113-
if err = ConfigDetectLogger(logDir, logLevel); nil != err {
113+
if err = ConfigDetectLogger(logDir, logLevel); err != nil {
114114
return fmt.Errorf("fail to ConfigDetectLogger: %v", err)
115115
}
116-
if err = ConfigStatReportLogger(logDir, logLevel); nil != err {
116+
if err = ConfigStatReportLogger(logDir, logLevel); err != nil {
117117
return fmt.Errorf("fail to ConfigStatReportLogger: %v", err)
118118
}
119-
if err = ConfigNetworkLogger(logDir, logLevel); nil != err {
119+
if err = ConfigNetworkLogger(logDir, logLevel); err != nil {
120120
return fmt.Errorf("fail to ConfigNetworkLogger: %v", err)
121121
}
122122
return nil
@@ -184,30 +184,30 @@ func SetLoggersDir(logDir string) error {
184184
var errs error
185185
var err error
186186
option := log.CreateDefaultLoggerOptions(filepath.Join(logDir, log.DefaultBaseLogRotationPath), DefaultBaseLogLevel)
187-
if err = log.ConfigBaseLogger(log.DefaultLogger, option); nil != err {
187+
if err = log.ConfigBaseLogger(log.DefaultLogger, option); err != nil {
188188
errs = multierror.Append(errs, multierror.Prefix(err,
189189
fmt.Sprintf("fail to create default base logger with logDir: %s", logDir)))
190190
}
191191
option = log.CreateDefaultLoggerOptions(filepath.Join(logDir, log.DefaultStatLogRotationPath), DefaultStatLogLevel)
192-
if err = log.ConfigStatLogger(log.DefaultLogger, option); nil != err {
192+
if err = log.ConfigStatLogger(log.DefaultLogger, option); err != nil {
193193
errs = multierror.Append(errs, multierror.Prefix(err,
194194
fmt.Sprintf("fail to create default stat logger with logDir %s", logDir)))
195195
}
196196
option = log.CreateDefaultLoggerOptions(filepath.Join(logDir, log.DefaultDetectLogRotationPath),
197197
DefaultDetectLogLevel)
198-
if err = log.ConfigDetectLogger(log.DefaultLogger, option); nil != err {
198+
if err = log.ConfigDetectLogger(log.DefaultLogger, option); err != nil {
199199
errs = multierror.Append(errs, multierror.Prefix(err,
200200
fmt.Sprintf("fail to create default detect logger with logDir %s", logDir)))
201201
}
202202
option = log.CreateDefaultLoggerOptions(filepath.Join(logDir, log.DefaultStatReportLogRotationPath),
203203
DefaultStatReportLogLevel)
204-
if err = log.ConfigStatReportLogger(log.DefaultLogger, option); nil != err {
204+
if err = log.ConfigStatReportLogger(log.DefaultLogger, option); err != nil {
205205
errs = multierror.Append(errs, multierror.Prefix(err,
206206
fmt.Sprintf("fail to create default statReport logger with logDir %s", logDir)))
207207
}
208208
option = log.CreateDefaultLoggerOptions(filepath.Join(logDir, log.DefaultNetworkLogRotationPath),
209209
DefaultNetworkLogLevel)
210-
if err = log.ConfigNetworkLogger(log.DefaultLogger, option); nil != err {
210+
if err = log.ConfigNetworkLogger(log.DefaultLogger, option); err != nil {
211211
errs = multierror.Append(errs, multierror.Prefix(err,
212212
fmt.Sprintf("fail to create default network logger with logDir %s", logDir)))
213213
}

0 commit comments

Comments
 (0)