Triage log levels
diff --git a/binder/src/binder.rs b/binder/src/binder.rs
index 3365e9e..bbf6b55 100644
--- a/binder/src/binder.rs
+++ b/binder/src/binder.rs
@@ -18,7 +18,7 @@
use sgx_types::*;
use sgx_urts::SgxEnclave;
-use log::{debug, info};
+use log::{debug, error};
use serde::{Deserialize, Serialize};
use crate::ipc::ECallChannel;
@@ -84,7 +84,7 @@
FinalizeEnclaveInput,
) {
Ok(_) => {}
- Err(e) => info!("{:?}", e),
+ Err(e) => error!("{:?}", e),
}
}
}
diff --git a/executor/src/context.rs b/executor/src/context.rs
index 50cc3fc..6e1303d 100644
--- a/executor/src/context.rs
+++ b/executor/src/context.rs
@@ -314,7 +314,7 @@
FFI_OK
}
Err(e) => {
- info!("c_open_file: {:?}", e);
+ error!("c_open_file: {:?}", e);
FFI_FILE_ERROR
}
}
@@ -337,7 +337,7 @@
FFI_OK
}
Err(e) => {
- info!("c_open_file: {:?}", e);
+ error!("c_open_file: {:?}", e);
FFI_FILE_ERROR
}
}
@@ -367,7 +367,7 @@
FFI_OK
}
Err(e) => {
- info!("c_read_file: {:?}", e);
+ error!("c_read_file: {:?}", e);
FFI_FILE_ERROR
}
}
@@ -395,7 +395,7 @@
FFI_OK
}
Err(e) => {
- info!("c_write_file: {:?}", e);
+ error!("c_write_file: {:?}", e);
FFI_FILE_ERROR
}
}
@@ -411,7 +411,7 @@
match rtc_close_handle(handle) {
Ok(size) => FFI_OK,
Err(e) => {
- info!("c_close_file: {:?}", e);
+ error!("c_close_file: {:?}", e);
FFI_FILE_ERROR
}
}
diff --git a/services/authentication/enclave/src/api_service.rs b/services/authentication/enclave/src/api_service.rs
index a97e663..8695bef 100644
--- a/services/authentication/enclave/src/api_service.rs
+++ b/services/authentication/enclave/src/api_service.rs
@@ -157,7 +157,7 @@
let user = service.db_client.get_user("test_login_id").unwrap();
assert!(user.validate_token(&service.jwt_secret, &token));
- info!("saved user_info: {:?}", user);
+ debug!("saved user_info: {:?}", user);
let request = UserLoginRequest::new("test_login_id", "test_password1").into_request();
assert!(service.user_login(request).is_err());
}
diff --git a/services/authentication/enclave/src/internal_service.rs b/services/authentication/enclave/src/internal_service.rs
index ef10949..97dd5bc 100644
--- a/services/authentication/enclave/src/internal_service.rs
+++ b/services/authentication/enclave/src/internal_service.rs
@@ -96,7 +96,7 @@
let response = get_authenticate_response(id, &token, &service);
assert!(response.accept);
let token = validate_token(id, &service.jwt_secret, &token);
- info!("valid token: {:?}", token.unwrap());
+ debug!("valid token: {:?}", token.unwrap());
}
pub fn test_invalid_algorithm() {
diff --git a/services/authentication/enclave/src/user_db.rs b/services/authentication/enclave/src/user_db.rs
index 2483aeb..9b28e71 100644
--- a/services/authentication/enclave/src/user_db.rs
+++ b/services/authentication/enclave/src/user_db.rs
@@ -98,7 +98,7 @@
let call: DBCall = match receiver.recv() {
Ok(req) => req,
Err(e) => {
- info!("mspc receive error: {}", e);
+ warn!("mspc receive error: {}", e);
break;
}
};
@@ -119,7 +119,7 @@
};
match sender.send(response) {
Ok(_) => (),
- Err(e) => info!("mpsc send error: {}", e),
+ Err(e) => warn!("mpsc send error: {}", e),
}
}
});
diff --git a/services/execution/enclave/src/service.rs b/services/execution/enclave/src/service.rs
index 1928679..8d368c9 100644
--- a/services/execution/enclave/src/service.rs
+++ b/services/execution/enclave/src/service.rs
@@ -75,9 +75,9 @@
}
};
- log::info!("InvokeTask: {:?}", staged_task);
+ log::debug!("InvokeTask: {:?}", staged_task);
let result = self.invoke_task(&staged_task);
- log::info!("InvokeTask result: {:?}", result);
+ log::debug!("InvokeTask result: {:?}", result);
match self.update_task_result(&staged_task.task_id, result) {
Ok(_) => (),
@@ -114,7 +114,7 @@
)?;
let invocation = prepare_task(&task, &file_mgr)?;
- log::info!("Invoke function: {:?}", invocation);
+ log::debug!("Invoke function: {:?}", invocation);
let worker = Worker::default();
let summary = worker.invoke_function(invocation)?;
diff --git a/services/execution/enclave/src/task_file_manager.rs b/services/execution/enclave/src/task_file_manager.rs
index 908cbaf..8c0d19a 100644
--- a/services/execution/enclave/src/task_file_manager.rs
+++ b/services/execution/enclave/src/task_file_manager.rs
@@ -184,7 +184,7 @@
});
let request =
FileAgentRequest::new(HandleFileCommand::Download, req_info, fusion_base.as_ref());
- log::info!("Ocall file download request: {:?}", request);
+ log::debug!("Ocall file download request: {:?}", request);
handle_file_request(request)?;
Ok(())
}
@@ -285,7 +285,7 @@
});
let request =
FileAgentRequest::new(HandleFileCommand::Upload, req_info, fusion_base.as_ref());
- log::info!("Ocall file upload request: {:?}", request);
+ log::debug!("Ocall file upload request: {:?}", request);
handle_file_request(request)?;
Ok(())
}
diff --git a/services/management/enclave/src/service.rs b/services/management/enclave/src/service.rs
index a46a197..6ea1343 100644
--- a/services/management/enclave/src/service.rs
+++ b/services/management/enclave/src/service.rs
@@ -339,7 +339,7 @@
)
.map_err(|_| ServiceError::BadTask)?;
- log::info!("CreateTask: {:?}", task);
+ log::debug!("CreateTask: {:?}", task);
let ts: TaskState = task.into();
self.write_to_db(&ts)
@@ -362,7 +362,7 @@
ensure!(ts.has_participant(&user_id), ServiceError::PermissionDenied);
- log::info!("GetTask: {:?}", ts);
+ log::debug!("GetTask: {:?}", ts);
let response = GetTaskResponse {
task_id: ts.external_id(),
@@ -427,7 +427,7 @@
.map_err(|_| ServiceError::PermissionDenied)?;
}
- log::info!("AssignData: {:?}", task);
+ log::debug!("AssignData: {:?}", task);
let ts: TaskState = task.into();
self.write_to_db(&ts)
@@ -458,7 +458,7 @@
task.approve(&user_id)
.map_err(|_| ServiceError::PermissionDenied)?;
- log::info!("ApproveTask: approve:{:?}", task);
+ log::debug!("ApproveTask: approve:{:?}", task);
let ts: TaskState = task.into();
self.write_to_db(&ts)
@@ -488,18 +488,18 @@
.read_from_db(&ts.function_id)
.map_err(|_| ServiceError::PermissionDenied)?;
- log::info!("InvokeTask: get function: {:?}", function);
+ log::debug!("InvokeTask: get function: {:?}", function);
let mut task: Task<Stage> = ts.try_into().map_err(|e| {
log::warn!("Stage state error: {:?}", e);
ServiceError::PermissionDenied
})?;
- log::info!("InvokeTask: get task: {:?}", task);
+ log::debug!("InvokeTask: get task: {:?}", task);
let staged_task = task.stage_for_running(&user_id, function)?;
- log::info!("InvokeTask: staged task: {:?}", staged_task);
+ log::debug!("InvokeTask: staged task: {:?}", staged_task);
self.enqueue_to_db(StagedTask::get_queue_key().as_bytes(), &staged_task)?;
@@ -658,7 +658,7 @@
assert!(TeaclaveInputFile::match_prefix(&input_file.key_string()));
let value = input_file.to_vec().unwrap();
let deserialized_file = TeaclaveInputFile::from_slice(&value).unwrap();
- info!("file: {:?}", deserialized_file);
+ debug!("file: {:?}", deserialized_file);
}
pub fn handle_output_file() {
@@ -667,7 +667,7 @@
assert!(TeaclaveOutputFile::match_prefix(&output_file.key_string()));
let value = output_file.to_vec().unwrap();
let deserialized_file = TeaclaveOutputFile::from_slice(&value).unwrap();
- info!("file: {:?}", deserialized_file);
+ debug!("file: {:?}", deserialized_file);
}
pub fn handle_function() {
@@ -686,7 +686,7 @@
assert!(Function::match_prefix(&function.key_string()));
let value = function.to_vec().unwrap();
let deserialized_function = Function::from_slice(&value).unwrap();
- info!("function: {:?}", deserialized_function);
+ debug!("function: {:?}", deserialized_function);
}
pub fn handle_task() {
@@ -713,7 +713,7 @@
let ts: TaskState = task.try_into().unwrap();
let value = ts.to_vec().unwrap();
let deserialized_task = TaskState::from_slice(&value).unwrap();
- info!("task: {:?}", deserialized_task);
+ debug!("task: {:?}", deserialized_task);
}
pub fn handle_staged_task() {
@@ -740,6 +740,6 @@
let value = staged_task.to_vec().unwrap();
let deserialized_data = StagedTask::from_slice(&value).unwrap();
- info!("staged task: {:?}", deserialized_data);
+ debug!("staged task: {:?}", deserialized_data);
}
}
diff --git a/services/scheduler/enclave/src/service.rs b/services/scheduler/enclave/src/service.rs
index fe03eb7..7f86eeb 100644
--- a/services/scheduler/enclave/src/service.rs
+++ b/services/scheduler/enclave/src/service.rs
@@ -170,7 +170,7 @@
let ts = self.get_task_state(&request.task_id)?;
let task: Task<Run> = ts.try_into()?;
- log::info!("UpdateTaskStatus: Task {:?}", task);
+ log::debug!("UpdateTaskStatus: Task {:?}", task);
// Only TaskStatus::Running is implicitly allowed here.
let ts = TaskState::from(task);
@@ -195,7 +195,7 @@
// Updating task result means we have finished execution
task.update_result(request.task_result)?;
- log::info!("UpdateTaskResult: Task {:?}", task);
+ log::debug!("UpdateTaskResult: Task {:?}", task);
let ts = TaskState::from(task);
self.put_into_db(&ts)?;
diff --git a/tests/functional/enclave/src/authentication_service.rs b/tests/functional/enclave/src/authentication_service.rs
index a3257d5..70b6d8c 100644
--- a/tests/functional/enclave/src/authentication_service.rs
+++ b/tests/functional/enclave/src/authentication_service.rs
@@ -78,7 +78,7 @@
let request = UserLoginRequest::new("test_login_id1", "test_password");
let response_result = client.user_login(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
}
@@ -91,7 +91,7 @@
let request = UserLoginRequest::new("test_login_id2", "wrong_password");
let response_result = client.user_login(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_err());
}
@@ -109,7 +109,7 @@
let credential = UserCredential::new("test_authenticate_id1", response_result.unwrap().token);
let request = UserAuthenticateRequest::new(credential);
let response_result = internal_client.user_authenticate(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.unwrap().accept);
}
@@ -125,7 +125,7 @@
let credential = UserCredential::new("test_authenticate_id2", "wrong_token");
let request = UserAuthenticateRequest::new(credential);
let response_result = internal_client.user_authenticate(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(!response_result.unwrap().accept);
}
@@ -134,7 +134,7 @@
let mut client = get_api_client();
let request = UserRegisterRequest::new("test_register_id1", "test_password");
let response_result = client.user_register(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
}
@@ -146,6 +146,6 @@
assert!(response_result.is_ok());
let request = UserRegisterRequest::new("test_register_id2", "test_password");
let response_result = client.user_register(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_err());
}
diff --git a/tests/functional/enclave/src/end_to_end/builtin_echo.rs b/tests/functional/enclave/src/end_to_end/builtin_echo.rs
index 890fec0..67242bc 100644
--- a/tests/functional/enclave/src/end_to_end/builtin_echo.rs
+++ b/tests/functional/enclave/src/end_to_end/builtin_echo.rs
@@ -35,7 +35,7 @@
let response = client.register_function(request).unwrap();
- log::info!("Register function: {:?}", response);
+ log::debug!("Register function: {:?}", response);
// Create Task
let function_id = response.function_id;
@@ -46,7 +46,7 @@
let response = client.create_task(request).unwrap();
- log::info!("Create task: {:?}", response);
+ log::debug!("Create task: {:?}", response);
let task_id = response.task_id;
diff --git a/tests/functional/enclave/src/end_to_end/builtin_gbdt_train.rs b/tests/functional/enclave/src/end_to_end/builtin_gbdt_train.rs
index 0c35a68..b69e5f7 100644
--- a/tests/functional/enclave/src/end_to_end/builtin_gbdt_train.rs
+++ b/tests/functional/enclave/src/end_to_end/builtin_gbdt_train.rs
@@ -69,7 +69,7 @@
.outputs(vec![fn_output]);
let response = client.register_function(request).unwrap();
- log::info!("Register function: {:?}", response);
+ log::debug!("Register function: {:?}", response);
response.function_id
}
@@ -82,7 +82,7 @@
let request = RegisterInputFileRequest::new(url, cmac, crypto_info);
let response = client.register_input_file(request).unwrap();
- log::info!("Register input: {:?}", response);
+ log::debug!("Register input: {:?}", response);
response.data_id
}
@@ -95,7 +95,7 @@
.unwrap();
let request = RegisterOutputFileRequest::new(url, crypto);
let response = client.register_output_file(request).unwrap();
- log::info!("Register output: {:?}", response);
+ log::debug!("Register output: {:?}", response);
response.data_id
}
@@ -123,7 +123,7 @@
.outputs_ownership(hashmap!("trained_model" => vec![USERNAME]));
let response = client.create_task(request).unwrap();
- log::info!("Create task: {:?}", response);
+ log::debug!("Create task: {:?}", response);
response.task_id
}
@@ -142,5 +142,5 @@
);
let response = client.assign_data(request).unwrap();
- log::info!("Assign data: {:?}", response);
+ log::debug!("Assign data: {:?}", response);
}
diff --git a/tests/functional/enclave/src/end_to_end/mesapy_data_fusion.rs b/tests/functional/enclave/src/end_to_end/mesapy_data_fusion.rs
index 0630ef5..dbbc228 100644
--- a/tests/functional/enclave/src/end_to_end/mesapy_data_fusion.rs
+++ b/tests/functional/enclave/src/end_to_end/mesapy_data_fusion.rs
@@ -64,7 +64,7 @@
.inputs(vec![input1, input2])
.outputs(vec![fusion_output]);
let response = client.register_function(request).unwrap();
- log::info!("Resgister function: {:?}", response);
+ log::debug!("Resgister function: {:?}", response);
response.function_id
}
@@ -78,7 +78,7 @@
let cmac = FileAuthTag::from_hex(auth_tag.as_ref()).unwrap();
let request = RegisterInputFileRequest::new(url, cmac, crypto);
let response = client.register_input_file(request).unwrap();
- log::info!("Register input: {:?}", response);
+ log::debug!("Register input: {:?}", response);
response.data_id
}
@@ -104,7 +104,7 @@
.outputs_ownership(hashmap!("OutFusionData" => vec![USERNAME1, USERNAME2]))
.executor(Executor::MesaPy);
let response = client.create_task(request).unwrap();
- log::info!("Create task: {:?}", response);
+ log::debug!("Create task: {:?}", response);
response.task_id
}
@@ -116,7 +116,7 @@
) {
let request = AssignDataRequest::new(task_id.clone(), input_map, output_map);
let response = client.assign_data(request).unwrap();
- log::info!("Assign data: {:?}", response);
+ log::debug!("Assign data: {:?}", response);
}
#[test_case]
@@ -239,7 +239,7 @@
.public(true)
.inputs(vec![input_spec]);
let response = client.register_function(request).unwrap();
- log::info!("Resgister function: {:?}", response);
+ log::debug!("Resgister function: {:?}", response);
response.function_id
}
@@ -256,6 +256,6 @@
))
.executor(Executor::MesaPy);
let response = client.create_task(request).unwrap();
- log::info!("Create task: {:?}", response);
+ log::debug!("Create task: {:?}", response);
response.task_id
}
diff --git a/tests/functional/enclave/src/end_to_end/mesapy_echo.rs b/tests/functional/enclave/src/end_to_end/mesapy_echo.rs
index 749931d..53058a5 100644
--- a/tests/functional/enclave/src/end_to_end/mesapy_echo.rs
+++ b/tests/functional/enclave/src/end_to_end/mesapy_echo.rs
@@ -44,7 +44,7 @@
let response = client.register_function(request).unwrap();
- log::info!("Resgister function: {:?}", response);
+ log::debug!("Resgister function: {:?}", response);
// Create Task
let function_id = response.function_id;
@@ -55,14 +55,14 @@
let response = client.create_task(request).unwrap();
- log::info!("Create task: {:?}", response);
+ log::debug!("Create task: {:?}", response);
// Assign Data To Task
let task_id = response.task_id;
let request = AssignDataRequest::new(task_id.clone(), hashmap!(), hashmap!());
let response = client.assign_data(request).unwrap();
- log::info!("Assign data: {:?}", response);
+ log::debug!("Assign data: {:?}", response);
// Approve Task
approve_task(&mut client, &task_id).unwrap();
diff --git a/tests/functional/enclave/src/end_to_end/mod.rs b/tests/functional/enclave/src/end_to_end/mod.rs
index e6f5502..abc1ca9 100644
--- a/tests/functional/enclave/src/end_to_end/mod.rs
+++ b/tests/functional/enclave/src/end_to_end/mod.rs
@@ -29,7 +29,7 @@
fn get_task(client: &mut TeaclaveFrontendClient, task_id: &ExternalID) -> GetTaskResponse {
let request = GetTaskRequest::new(task_id.clone());
let response = client.get_task(request).unwrap();
- log::info!("Get task: {:?}", response);
+ log::debug!("Get task: {:?}", response);
response
}
@@ -41,7 +41,7 @@
loop {
let request = GetTaskRequest::new(task_id.clone());
let response = client.get_task(request).unwrap();
- log::info!("Get task: {:?}", response);
+ log::debug!("Get task: {:?}", response);
std::thread::sleep(std::time::Duration::from_secs(1));
@@ -49,7 +49,7 @@
match response.result {
TaskResult::Ok(outputs) => {
let ret_val = String::from_utf8(outputs.return_value).unwrap();
- log::info!("Task returns: {:?}", ret_val);
+ log::debug!("Task returns: {:?}", ret_val);
return ret_val;
}
TaskResult::Err(failure) => {
@@ -65,13 +65,13 @@
fn approve_task(client: &mut TeaclaveFrontendClient, task_id: &ExternalID) -> anyhow::Result<()> {
let request = ApproveTaskRequest::new(task_id.clone());
let response = client.approve_task(request)?;
- log::info!("Approve task: {:?}", response);
+ log::debug!("Approve task: {:?}", response);
Ok(())
}
fn invoke_task(client: &mut TeaclaveFrontendClient, task_id: &ExternalID) -> anyhow::Result<()> {
let request = InvokeTaskRequest::new(task_id.clone());
let response = client.invoke_task(request)?;
- log::info!("Invoke task: {:?}", response);
+ log::debug!("Invoke task: {:?}", response);
Ok(())
}
diff --git a/tests/functional/enclave/src/storage_service.rs b/tests/functional/enclave/src/storage_service.rs
index 1131377..edb9344 100644
--- a/tests/functional/enclave/src/storage_service.rs
+++ b/tests/functional/enclave/src/storage_service.rs
@@ -34,7 +34,7 @@
let mut client = get_client();
let request = GetRequest::new("test_get_key");
let response_result = client.get(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
}
@@ -51,12 +51,12 @@
let mut client = get_client();
let request = PutRequest::new("test_put_key", "test_put_value");
let response_result = client.put(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
let request = GetRequest::new("test_put_key");
let response_result = client.get(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
assert_eq!(response_result.unwrap().value, b"test_put_value");
}
@@ -66,7 +66,7 @@
let mut client = get_client();
let request = DeleteRequest::new("test_delete_key");
let response_result = client.delete(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
let request = GetRequest::new("test_delete_key");
@@ -79,7 +79,7 @@
let mut client = get_client();
let request = EnqueueRequest::new("test_enqueue_key", "test_enqueue_value");
let response_result = client.enqueue(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
}
diff --git a/tests/functional/enclave/src/utils.rs b/tests/functional/enclave/src/utils.rs
index aa264b7..938d0a1 100644
--- a/tests/functional/enclave/src/utils.rs
+++ b/tests/functional/enclave/src/utils.rs
@@ -141,7 +141,7 @@
let request = UserRegisterRequest::new(username, password);
let response = api_client.user_register(request)?;
- log::info!("User register: {:?}", response);
+ log::debug!("User register: {:?}", response);
Ok(())
}
@@ -154,7 +154,7 @@
let request = UserLoginRequest::new(username, password);
let response = api_client.user_login(request)?;
- log::info!("User login: {:?}", response);
+ log::debug!("User login: {:?}", response);
Ok(UserCredential::new(username, response.token))
}
diff --git a/tests/integration/enclave/src/teaclave_rpc.rs b/tests/integration/enclave/src/teaclave_rpc.rs
index 609e65c..558aea5 100644
--- a/tests/integration/enclave/src/teaclave_rpc.rs
+++ b/tests/integration/enclave/src/teaclave_rpc.rs
@@ -62,7 +62,7 @@
&self,
request: teaclave_rpc::Request<EchoRequest>,
) -> TeaclaveServiceResponseResult<EchoResponse> {
- info!("handle request: {:?}", request);
+ debug!("handle request: {:?}", request);
let message = match request.message {
EchoRequest::Say(s) => s.message,
};
@@ -138,7 +138,7 @@
message: "Hello, World!".to_string(),
};
let response_result = client.say(request);
- info!("{:?}", response_result);
+ debug!("{:?}", response_result);
assert!(response_result.is_ok());
assert!(response_result.unwrap().message == "Hello, World!");