update: add rpc command error tips

bigfile · Sep 16, 2019 · a110c1b · a110c1b
1 parent 777d361
commit a110c1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/artisan/rpc/rpc.go b/artisan/rpc/rpc.go
@@ -111,9 +111,11 @@ var (
  listener net.Listener
  )
  if serverCert, err = tls.LoadX509KeyPair(ctx.String("server-cert"), ctx.String("server-key")); err != nil {
+ log.MustNewLogger(nil).Errorf("load server certificates failed, %s", err)
  return
  }
  if rootCaContentBytes, err = ioutil.ReadFile(ctx.String("ca-cert")); err != nil {
+ log.MustNewLogger(nil).Errorf("load ca certificates failed, %s", err)
  return
  }
  if !certPool.AppendCertsFromPEM(rootCaContentBytes) {

diff --git a/rpc/server_test.go b/rpc/server_test.go
@@ -89,7 +89,7 @@ func TestServer_TokenCreate(t *testing.T) {
  AppSecret: app.Secret,
  Path: &wrappers.StringValue{Value: "/random"},
  Ip: &wrappers.StringValue{Value: "192.168.0.1"},
- Secret: &wrappers.StringValue{Value: models.RandomWithMd5(22)},
+ Secret: &wrappers.StringValue{Value: models.NewSecret()},
  AvailableTimes: &wrappers.UInt32Value{Value: 1000},
  ReadOnly: &wrappers.BoolValue{Value: true},
  ExpiredAt: &timestamp.Timestamp{Seconds: time.Now().Add(10 * time.Minute).Unix()},
@@ -98,7 +98,7 @@ func TestServer_TokenCreate(t *testing.T) {
  assert.True(t, resp.RequestId > 0)
  assert.Equal(t, "/random", resp.Token.Path)
  assert.Equal(t, 32, len(resp.Token.Token))
- assert.Equal(t, 32, len(resp.Token.Secret.GetValue()))
+ assert.Equal(t, models.SecretLength, len(resp.Token.Secret.GetValue()))
  assert.Equal(t, int32(1000), resp.Token.AvailableTimes)
  assert.Equal(t, "192.168.0.1", resp.Token.Ip.GetValue())
  assert.True(t, resp.Token.ReadOnly)