Skip to content

Commit 2ca8a5f

Browse files
committed
replace println with logd in player modules
1 parent de45183 commit 2ca8a5f

File tree

24 files changed

+567
-404
lines changed

24 files changed

+567
-404
lines changed

src/Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/src/etcd.rs

Lines changed: 57 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
use crate::logd;
67
use crate::rocksdbservice::{
78
rocks_db_service_client::RocksDbServiceClient, BatchPutRequest, DeleteRequest,
89
GetByPrefixRequest, GetRequest, HealthRequest, KeyValue, PutRequest,
@@ -17,9 +18,9 @@ lazy_static::lazy_static! {
1718

1819
/// Put a key-value pair into the gRPC RocksDB service
1920
pub async fn put(key: &str, value: &str) -> Result<(), String> {
20-
crate::logd!(
21+
logd!(
2122
2,
22-
"[ETCD->RocksDB-gRPC] Putting key '{}' to service: {}",
23+
"[RocksDB] Putting key '{}' to service: {}",
2324
key,
2425
*ROCKSDB_SERVICE_URL
2526
);
@@ -35,34 +36,35 @@ pub async fn put(key: &str, value: &str) -> Result<(), String> {
3536
Ok(response) => {
3637
let put_response = response.into_inner();
3738
if put_response.success {
38-
println!("[ETCD->RocksDB-gRPC] Successfully stored key: {}", key);
3939
Ok(())
4040
} else {
4141
let error_msg = put_response.error;
42-
println!("[ETCD->RocksDB-gRPC] Put failed: {}", error_msg);
42+
logd!(5, "[RocksDB] Put failed: {}", error_msg);
4343
Err(error_msg)
4444
}
4545
}
4646
Err(e) => {
4747
let error_msg = format!("gRPC request failed: {}", e);
48-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
48+
logd!(5, "[RocksDB] {}", error_msg);
4949
Err(error_msg)
5050
}
5151
}
5252
}
5353
Err(e) => {
5454
let error_msg = format!("Failed to create client: {}", e);
55-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
55+
logd!(5, "[RocksDB] {}", error_msg);
5656
Err(error_msg)
5757
}
5858
}
5959
}
6060

6161
/// Get a value by key from the gRPC RocksDB service
6262
pub async fn get(key: &str) -> Result<String, String> {
63-
println!(
64-
"[ETCD->RocksDB-gRPC] Getting key '{}' from service: {}",
65-
key, *ROCKSDB_SERVICE_URL
63+
logd!(
64+
2,
65+
"[RocksDB] Getting key '{}' from service: {}",
66+
key,
67+
*ROCKSDB_SERVICE_URL
6668
);
6769

6870
match RocksDbServiceClient::connect(ROCKSDB_SERVICE_URL.clone()).await {
@@ -75,33 +77,40 @@ pub async fn get(key: &str) -> Result<String, String> {
7577
Ok(response) => {
7678
let get_response = response.into_inner();
7779
if get_response.success {
78-
println!("[ETCD->RocksDB-gRPC] Successfully retrieved key: {} (value length: {})", key, get_response.value.len());
80+
logd!(
81+
2,
82+
"[RocksDB] Successfully retrieved key: {} (value length: {})",
83+
key,
84+
get_response.value.len()
85+
);
7986
Ok(get_response.value)
8087
} else {
81-
println!("[ETCD->RocksDB-gRPC] Key not found: {}", key);
88+
logd!(5, "[RocksDB] Key not found: {}", key);
8289
Err("Key not found".to_string())
8390
}
8491
}
8592
Err(e) => {
8693
let error_msg = format!("gRPC request failed: {}", e);
87-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
94+
logd!(5, "[RocksDB] {}", error_msg);
8895
Err(error_msg)
8996
}
9097
}
9198
}
9299
Err(e) => {
93100
let error_msg = format!("Failed to create client: {}", e);
94-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
101+
logd!(5, "[RocksDB] {}", error_msg);
95102
Err(error_msg)
96103
}
97104
}
98105
}
99106

100107
/// Get all key-value pairs with the specified prefix using gRPC RocksDB service
101108
pub async fn get_all_with_prefix(prefix: &str) -> Result<Vec<(String, String)>, String> {
102-
println!(
103-
"[ETCD->RocksDB-gRPC] Getting all keys with prefix '{}' from service: {}",
104-
prefix, *ROCKSDB_SERVICE_URL
109+
logd!(
110+
2,
111+
"[RocksDB] Getting all keys with prefix '{}' from service: {}",
112+
prefix,
113+
*ROCKSDB_SERVICE_URL
105114
);
106115

107116
match RocksDbServiceClient::connect(ROCKSDB_SERVICE_URL.clone()).await {
@@ -120,40 +129,40 @@ pub async fn get_all_with_prefix(prefix: &str) -> Result<Vec<(String, String)>,
120129
.into_iter()
121130
.map(|kv| (kv.key, kv.value))
122131
.collect();
123-
println!(
124-
"[ETCD->RocksDB-gRPC] Successfully retrieved {} keys with prefix '{}'",
132+
logd!(
133+
2,
134+
"[RocksDB] Successfully retrieved {} keys with prefix '{}'",
125135
result.len(),
126136
prefix
127137
);
128138
Ok(result)
129139
} else {
130-
println!(
131-
"[ETCD->RocksDB-gRPC] Error from service: {}",
132-
get_response.error
133-
);
140+
logd!(5, "[RocksDB] Error from service: {}", get_response.error);
134141
Err(get_response.error)
135142
}
136143
}
137144
Err(e) => {
138145
let error_msg = format!("gRPC request failed: {}", e);
139-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
146+
logd!(5, "[RocksDB] {}", error_msg);
140147
Err(error_msg)
141148
}
142149
}
143150
}
144151
Err(e) => {
145152
let error_msg = format!("Failed to create client: {}", e);
146-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
153+
logd!(5, "[RocksDB] {}", error_msg);
147154
Err(error_msg)
148155
}
149156
}
150157
}
151158

152159
/// Delete a key from the gRPC RocksDB service
153160
pub async fn delete(key: &str) -> Result<(), String> {
154-
println!(
155-
"[ETCD->RocksDB-gRPC] Deleting key '{}' from service: {}",
156-
key, *ROCKSDB_SERVICE_URL
161+
logd!(
162+
2,
163+
"[RocksDB] Deleting key '{}' from service: {}",
164+
key,
165+
*ROCKSDB_SERVICE_URL
157166
);
158167

159168
match RocksDbServiceClient::connect(ROCKSDB_SERVICE_URL.clone()).await {
@@ -166,33 +175,34 @@ pub async fn delete(key: &str) -> Result<(), String> {
166175
Ok(response) => {
167176
let delete_response = response.into_inner();
168177
if delete_response.success {
169-
println!("[ETCD->RocksDB-gRPC] Successfully deleted key: {}", key);
178+
logd!(2, "[RocksDB] Successfully deleted key: {}", key);
170179
Ok(())
171180
} else {
172181
let error_msg = delete_response.error;
173-
println!("[ETCD->RocksDB-gRPC] Delete failed: {}", error_msg);
182+
logd!(5, "[RocksDB] Delete failed: {}", error_msg);
174183
Err(error_msg)
175184
}
176185
}
177186
Err(e) => {
178187
let error_msg = format!("gRPC request failed: {}", e);
179-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
188+
logd!(5, "[RocksDB] {}", error_msg);
180189
Err(error_msg)
181190
}
182191
}
183192
}
184193
Err(e) => {
185194
let error_msg = format!("Failed to create client: {}", e);
186-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
195+
logd!(5, "[RocksDB] {}", error_msg);
187196
Err(error_msg)
188197
}
189198
}
190199
}
191200

192201
/// Batch put operation to store multiple key-value pairs using gRPC RocksDB service
193202
pub async fn batch_put(items: Vec<(String, String)>) -> Result<(), String> {
194-
println!(
195-
"[ETCD->RocksDB-gRPC] Batch putting {} items to service: {}",
203+
logd!(
204+
3,
205+
"[RocksDB] Batch putting {} items to service: {}",
196206
items.len(),
197207
*ROCKSDB_SERVICE_URL
198208
);
@@ -210,36 +220,38 @@ pub async fn batch_put(items: Vec<(String, String)>) -> Result<(), String> {
210220
Ok(response) => {
211221
let batch_response = response.into_inner();
212222
if batch_response.success {
213-
println!(
214-
"[ETCD->RocksDB-gRPC] Successfully stored {} items in batch",
223+
logd!(
224+
2,
225+
"[RocksDB] Successfully stored {} items in batch",
215226
batch_response.processed_count
216227
);
217228
Ok(())
218229
} else {
219230
let error_msg = batch_response.error;
220-
println!("[ETCD->RocksDB-gRPC] Batch put failed: {}", error_msg);
231+
logd!(5, "[RocksDB] Batch put failed: {}", error_msg);
221232
Err(error_msg)
222233
}
223234
}
224235
Err(e) => {
225236
let error_msg = format!("gRPC request failed: {}", e);
226-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
237+
logd!(5, "[RocksDB] {}", error_msg);
227238
Err(error_msg)
228239
}
229240
}
230241
}
231242
Err(e) => {
232243
let error_msg = format!("Failed to create client: {}", e);
233-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
244+
logd!(5, "[RocksDB] {}", error_msg);
234245
Err(error_msg)
235246
}
236247
}
237248
}
238249

239250
/// Health check for the gRPC RocksDB service
240251
pub async fn health_check() -> Result<bool, String> {
241-
println!(
242-
"[ETCD->RocksDB-gRPC] Health check for service: {}",
252+
logd!(
253+
1,
254+
"[RocksDB] Health check for service: {}",
243255
*ROCKSDB_SERVICE_URL
244256
);
245257

@@ -251,22 +263,23 @@ pub async fn health_check() -> Result<bool, String> {
251263
Ok(response) => {
252264
let health_response = response.into_inner();
253265
let is_healthy = health_response.status == "healthy";
254-
println!(
255-
"[ETCD->RocksDB-gRPC] Health check result: {}",
266+
logd!(
267+
2,
268+
"[RocksDB] Health check result: {}",
256269
health_response.status
257270
);
258271
Ok(is_healthy)
259272
}
260273
Err(e) => {
261274
let error_msg = format!("Health check failed: {}", e);
262-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
275+
logd!(5, "[RocksDB] {}", error_msg);
263276
Err(error_msg)
264277
}
265278
}
266279
}
267280
Err(e) => {
268281
let error_msg = format!("Failed to create client: {}", e);
269-
println!("[ETCD->RocksDB-gRPC] {}", error_msg);
282+
logd!(5, "[RocksDB] {}", error_msg);
270283
Err(error_msg)
271284
}
272285
}

src/player/actioncontroller/src/grpc/mod.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
pub mod receiver;
66
pub mod sender;
77

8+
use common::logd;
89
use std::sync::Arc;
9-
1010
use tonic::transport::Server;
1111

1212
/// Initialize the gRPC communication system for ActionController
@@ -29,19 +29,19 @@ pub async fn init(manager: crate::manager::ActionControllerManager) -> common::R
2929
let grpc_server = receiver::ActionControllerReceiver::new(arc_manager.clone());
3030

3131
let addr = common::actioncontroller::open_server().parse()?;
32-
println!("Starting gRPC server on {}", addr);
32+
logd!(1, "Starting gRPC server on {}", addr);
3333

3434
tokio::spawn(async move {
3535
if let Err(e) = Server::builder()
3636
.add_service(grpc_server.into_service())
3737
.serve(addr)
3838
.await
3939
{
40-
eprintln!("gRPC server error: {}", e);
40+
logd!(5, "gRPC server error: {}", e);
4141
}
4242
});
4343

44-
println!("gRPC server started and listening");
44+
logd!(1, "gRPC server started and listening");
4545

4646
Ok(())
4747
}
@@ -56,7 +56,6 @@ mod tests {
5656
#[tokio::test]
5757
async fn test_open_server_returns_valid_address() {
5858
let addr = common::actioncontroller::open_server();
59-
println!("open_server() returned: {}", addr);
6059

6160
// Just check it contains ":" (host:port format)
6261
assert!(addr.contains(':'), "Address should be in host:port format");
@@ -65,7 +64,6 @@ mod tests {
6564
#[tokio::test]
6665
async fn test_connect_server_returns_valid_url() {
6766
let url = common::actioncontroller::connect_server();
68-
println!("connect_server() returned: {}", url);
6967

7068
// Should start with http:// and contain ":"
7169
assert!(url.starts_with("http://"));

0 commit comments

Comments
 (0)