lifegpc/pixiv_downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/pixiv_downloader.git synced 2026-06-06 05:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more logging

Browse Source
This commit is contained in:
lifegpc
2024-09-21 07:34:54 +00:00
committed by GitHub
parent a6c5f545a8
commit 4538d9f205
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/push/every_push.rs
View File

@@ -76,6 +76,7 @@ impl EveryPushClient {
Some(t) => params.insert("type", t.as_ref()),
None => None,
};
log::debug!(target: "every_push", "Push message params: {:?}", params);
let re = self
.client
.post(format!("{}/message/push", self.server), None, Some(params))
@@ -86,16 +87,19 @@ impl EveryPushClient {
Ok(())
} else {
match re.text().await {
Ok(t) => match json::parse(t.as_str()) {
Ok(v) => {
let msg = v["message"].as_str();
match msg {
Some(m) => Err(m.to_owned()),
None => Err(format!("HTTP ERROR {}", status)),
Ok(t) => {
log::debug!(target: "every_push", "Error message: {}", t);
match json::parse(t.as_str()) {
Ok(v) => {
let msg = v["message"].as_str();
match msg {
Some(m) => Err(m.to_owned()),
None => Err(format!("HTTP ERROR {}", status)),
}
}
Err(e) => Err(format!("HTTP ERROR {}: {}", status, e)),
}
Err(e) => Err(format!("HTTP ERROR {}: {}", status, e)),
},
}
Err(e) => Err(format!("HTTP ERROR {}: {}", status, e)),
}
}

16
src/push/pushdeer.rs
View File

@@ -17,13 +17,12 @@ impl PushdeerClient {
}
async fn handle_result(re: reqwest::Response) -> Result<(), String> {
let obj = json::parse(
re.text()
.await
.try_err4("Failed to read text from response: ")?
.as_str(),
)
.try_err4("Failed to parse JSON: ")?;
let text = re
.text()
.await
.try_err4("Failed to read text from response: ")?;
log::debug!(target: "pushdeer", "Pushdeer server response: {}", text);
let obj = json::parse(text.as_str()).try_err4("Failed to parse JSON: ")?;
let code = obj["code"].as_i64().ok_or("Failed to get code.")?;
if code == 0 {
Ok(())
@@ -46,6 +45,7 @@ impl PushdeerClient {
let mut params = HashMap::new();
params.insert("pushkey", pushkey.as_ref());
params.insert("text", text.as_ref());
log::debug!(target: "pushdeer", "Push text message params: {:?}", params);
let re = self
.client
.post(format!("{}/message/push", self.server), None, Some(params))
@@ -66,6 +66,7 @@ impl PushdeerClient {
params.insert("pushkey", pushkey.as_ref());
params.insert("text", image.as_ref());
params.insert("type", "image");
log::debug!(target: "pushdeer", "Push image message params: {:?}", params);
let re = self
.client
.post(format!("{}/message/push", self.server), None, Some(params))
@@ -93,6 +94,7 @@ impl PushdeerClient {
params.insert("text", title.as_ref());
params.insert("desp", text.as_ref());
params.insert("type", "markdown");
log::debug!(target: "pushdeer", "Push markdown message params: {:?}", params);
let re = self
.client
.post(format!("{}/message/push", self.server), None, Some(params))

8
src/server/push/task/mod.rs
View File

@@ -108,17 +108,17 @@ pub async fn run_checking(ctx: Arc<ServerContext>) {
for (id, task) in tasks {
let re = task.await;
if let Ok(Err(e)) = re {
log::warn!("Push task error (task id: {}): {}", id, e);
log::warn!(target: "push_task", "Push task error (task id: {}): {}", id, e);
} else if let Err(e) = re {
log::error!("Join error: {}", e);
log::error!(target: "push_task", "Join error: {}", e);
} else if let Ok(Ok(())) = re {
log::debug!("Push task finished: {}", id);
log::debug!(target: "push_task", "Push task finished: {}", id);
}
}
let all_tasks = match ctx.db.get_all_push_tasks().await {
Ok(t) => t,
Err(e) => {
log::error!("Get all push tasks error: {}", e);
log::error!(target: "push_task", "Get all push tasks error: {}", e);
break;
}
};