Merge pull request #855 from AppFlowy-IO/ci/try_fix_unit_test

chore: add log
This commit is contained in:
Nathan.fooo 2022-08-15 23:12:41 +08:00 committed by GitHub
commit a4f2ebf207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 15 deletions

View File

@ -93,6 +93,8 @@ impl fmt::Display for FlowyError {
impl lib_dispatch::Error for FlowyError {
fn as_response(&self) -> EventResponse {
let bytes: Bytes = self.clone().try_into().unwrap();
println!("Serialize FlowyError: {:?} to event response", self);
ResponseBuilder::Err().data(bytes).build()
}
}

View File

@ -68,7 +68,9 @@ impl AppController {
let app = transaction.read_app(&params.value)?;
let trash_ids = self.trash_controller.read_trash_ids(&transaction)?;
if trash_ids.contains(&app.id) {
return Err(FlowyError::record_not_found());
return Err(
FlowyError::record_not_found().context(format!("Can not find the app:{}", params.value))
);
}
Ok(app)
})

View File

@ -44,7 +44,7 @@ pub(crate) async fn update_app_handler(
Ok(())
}
#[tracing::instrument(level = "trace", skip(data, app_controller, view_controller))]
#[tracing::instrument(level = "info", skip(data, app_controller, view_controller), err)]
pub(crate) async fn read_app_handler(
data: Data<AppIdPB>,
app_controller: AppData<Arc<AppController>>,

View File

@ -83,15 +83,21 @@ where
R: FromBytes,
{
let response = self.get_response();
match response.parse::<R, E>() {
match response.clone().parse::<R, E>() {
Ok(Ok(data)) => data,
Ok(Err(e)) => {
panic!("Parser {:?} failed: {:?}", std::any::type_name::<R>(), e)
panic!(
"Parser {:?} failed: {:?}, response {:?}",
std::any::type_name::<R>(),
e,
response
)
}
Err(e) => panic!(
"Internal error: {:?}, parser {:?} failed",
e,
"Dispatch {:?} failed: {:?}, response {:?}",
std::any::type_name::<R>(),
e,
response
),
}
}

View File

@ -37,8 +37,8 @@ impl UserDB {
Some(database) => return Ok(database.get_pool()),
}
tracing::trace!("open user db {}", user_id);
let dir = format!("{}/{}", self.db_dir, user_id);
tracing::trace!("open user db {} at path: {}", user_id, dir);
let db = flowy_database::init(&dir).map_err(|e| {
log::error!("open user: {} db failed, {:?}", user_id, e);
FlowyError::internal().context(e)

View File

@ -14,7 +14,12 @@ where
fn into_bytes(self) -> Result<Bytes, DispatchError> {
match self.try_into() {
Ok(data) => Ok(data),
Err(e) => Err(InternalError::ProtobufError(format!("{:?}", e)).into()),
Err(e) => Err(InternalError::ProtobufError(format!(
"Serial {:?} to bytes failed:{:?}",
std::any::type_name::<T>(),
e
))
.into()),
}
}
}

View File

@ -55,7 +55,10 @@ where
{
fn respond_to(self, _request: &EventRequest) -> EventResponse {
match self.into_inner().into_bytes() {
Ok(bytes) => ResponseBuilder::Ok().data(bytes).build(),
Ok(bytes) => {
log::trace!("Serialize Data: {:?} to event response", std::any::type_name::<T>());
return ResponseBuilder::Ok().data(bytes).build();
}
Err(e) => e.into(),
}
}
@ -86,7 +89,11 @@ where
T: FromBytes,
{
match payload {
Payload::None => Err(InternalError::UnexpectedNone("Parse fail, expected payload".to_string()).into()),
Payload::None => Err(InternalError::UnexpectedNone(format!(
"Parse fail, expected payload:{:?}",
std::any::type_name::<T>()
))
.into()),
Payload::Bytes(bytes) => {
let data = T::parse_from_bytes(bytes.clone())?;
Ok(Data(data))

View File

@ -54,16 +54,18 @@ impl EventDispatcher {
callback: Some(Box::new(callback)),
};
let join_handle = dispatch.runtime.spawn(async move {
service
.call(service_ctx)
.await
.unwrap_or_else(|e| InternalError::Other(format!("{:?}", e)).as_response())
service.call(service_ctx).await.unwrap_or_else(|e| {
tracing::error!("Dispatch runtime error: {:?}", e);
InternalError::Other(format!("{:?}", e)).as_response()
})
});
DispatchFuture {
fut: Box::pin(async move {
join_handle.await.unwrap_or_else(|e| {
let error = InternalError::JoinError(format!("EVENT_DISPATCH join error: {:?}", e));
let msg = format!("EVENT_DISPATCH join error: {:?}", e);
tracing::error!("{}", msg);
let error = InternalError::JoinError(msg);
error.as_response()
})
}),