Skip to content

Client log optimize #214

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

Merged
zeqing-guo merged 3 commits into from
Jan 14, 2019
Merged

Client log optimize #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f883e86
Optimize client error log
Jan 14, 2019
4838e96
Update testnet link to doc site
Jan 14, 2019
20cfd16
Merge branch 'develop' into feature/clientLogOptimize
auxten Jan 14, 2019
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
5 changes: 2 additions & 3 deletions README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CovenantSQL 是应用区块链技术构建的去中心化 SQL 云数据库。

CovenantSQL 具备以下特点：

- **SQL接口**: 支持 SQL-92 标准，传统 App 几乎0修改即可数据上链
- **SQL接口**: 支持 SQL-92 标准，传统 App 几乎 0 修改即可数据上链
- **去中心化**: 基于独有的高效拜占庭容错共识算法 Kayak 实现的去中心化结构
- **不可篡改**: CovenantSQL 中的 Query 历史记录是可追溯的
- **隐私**: 如果 Bitcoin 是用户的钱包，那么 CovenantSQL 就是是用户的去中心化数据库
Expand Down Expand Up @@ -123,8 +123,7 @@ CovenantSQL仍在建设中，测试网已经发布，[尝试一下](https://test

## 测试网

- [快捷入口](https://testnet.covenantsql.io/quickstart)
- [测试网水龙头](https://testnet.covenantsql.io/)
- [快捷入口](https://developers.covenantsql.io)

## 联系我们

Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ Watch us or [![follow on Twitter](https://img.shields.io/twitter/url/https/twitt

## TestNet

- [Quick Start](https://testnet.covenantsql.io/quickstart)
- [TestNet faucet](https://testnet.covenantsql.io/)
- [Quick Start](https://developers.covenantsql.io)

## Contact

Expand Down
2 changes: 1 addition & 1 deletion client/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ ackWorkerLoop:
var ackRes types.AckResponse
// send ack back
if err = pc.Call(route.DBSAck.String(), ack, &ackRes); err != nil {
log.WithError(err).Warning("send ack failed")
log.WithError(err).Debug("send ack failed")
continue
}
}
Expand Down
11 changes: 5 additions & 6 deletions client/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,12 @@ func runPeerListUpdater() (err error) {
if _, err = getPeers(dbID, privKey); err != nil {
log.WithField("db", dbID).
WithError(err).
Warning("update peers failed")
Debug("update peers failed")

// TODO(xq262144), better rpc remote error judgement
if strings.Contains(err.Error(), bp.ErrNoSuchDatabase.Error()) {
log.WithField("db", dbID).
Warning("database no longer exists, stopped peers update")
Warning("database no longer exists, stopping peers update")
peerList.Delete(dbID)
}
}
Expand Down Expand Up @@ -493,14 +493,13 @@ func getPeers(dbID proto.DatabaseID, privKey *asymmetric.PrivateKey) (peers *pro
profileReq.DBID = dbID
err = rpc.RequestBP(route.MCCQuerySQLChainProfile.String(), profileReq, profileResp)
if err != nil {
log.WithError(err).Warning("get sqlchain profile failed in getPeers")
err = errors.Wrap(err, "get sqlchain profile failed in getPeers")
return
}

nodeIDs := make([]proto.NodeID, len(profileResp.Profile.Miners))
if len(profileResp.Profile.Miners) <= 0 {
err = ErrInvalidProfile
log.WithError(err).Warning("unexpected error in getPeers")
err = errors.Wrap(ErrInvalidProfile, "unexpected error in getPeers")
return
}
for i, mi := range profileResp.Profile.Miners {
Expand All @@ -514,7 +513,7 @@ func getPeers(dbID proto.DatabaseID, privKey *asymmetric.PrivateKey) (peers *pro
}
err = peers.Sign(privKey)
if err != nil {
log.WithError(err).Warning("sign peers failed in getPeers")
err = errors.Wrap(err, "sign peers failed in getPeers")
return
}

Expand Down