Merge pull request #4 from andylokandy/master

venslu · web-flow · commit d731e181682a · 2021-01-08T15:37:34.000+08:00
Support logs
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,4 +12,5 @@ crate-type = ["staticlib"]
 anyhow = "1"
 cxx = "=1.0.18"
 futures = "0.3"
+env_logger = "0.8"
 tikv-client = { git = "https://github.com/tikv/client-rust.git", rev = "72ab9b3" }
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ clean:
 	cargo clean
 
 run-example: target/tikv-example
-	$(cur_makefile_path)/target/tikv-example
+	RUST_LOG=debug $(cur_makefile_path)/target/tikv-example
 
 target/tikv-example: target/debug/libtikv_client.a example/main.cpp
 	c++ $(cur_makefile_path)/example/main.cpp -o $(cur_makefile_path)/target/tikv-example -std=c++17 -g -I$(cur_makefile_path)/include -L$(cur_makefile_path)/target/debug -ltikv_client -lpthread -ldl -lssl -lcrypto
diff --git a/src/lib.rs b/src/lib.rs
@@ -104,6 +104,8 @@ struct Transaction {
 }
 
 fn transaction_client_new(pd_endpoints: &CxxVector<CxxString>) -> Result<Box<TransactionClient>> {
+    env_logger::init();
+    
     let pd_endpoints = pd_endpoints
         .iter()
         .map(|str| str.to_str().map(ToOwned::to_owned))

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ struct Transaction {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`fn transaction_client_new(pd_endpoints: &CxxVector<CxxString>) -> Result<Box<TransactionClient>> {`
	`107`	`+ env_logger::init();`
	`108`	`+`
`107`	`109`	`let pd_endpoints = pd_endpoints`
`108`	`110`	`.iter()`
`109`	`111`	`.map(\|str\| str.to_str().map(ToOwned::to_owned))`