picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

import: improve logging a bit

This commit is contained in:
Lennart Poettering 2015-01-20 15:05:25 +01:00
parent 0d6e763b48
commit 68c913fd75
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/import/import-job.c
View File

@ -57,9 +57,10 @@ static void import_job_finish(ImportJob *j, int ret) {
j->state == IMPORT_JOB_FAILED)
return;
if (ret == 0)
if (ret == 0) {
j->state = IMPORT_JOB_DONE;
else {
log_info("Download of %s complete.", j->url);
} else {
j->state = IMPORT_JOB_FAILED;
j->error = ret;
}
@ -481,7 +482,7 @@ static size_t import_job_header_callback(void *contents, size_t size, size_t nme
goto fail;
}
log_info("Downloading %s.", format_bytes(bytes, sizeof(bytes), j->content_length));
log_info("Downloading %s for %s.", format_bytes(bytes, sizeof(bytes), j->content_length), j->url);
}
return sz;
@ -518,7 +519,8 @@ static int import_job_progress_callback(void *userdata, curl_off_t dltotal, curl
n = now(CLOCK_MONOTONIC);
if (n > j->last_status_usec + USEC_PER_SEC &&
percent != j->progress_percent) {
percent != j->progress_percent &&
dlnow < dltotal) {
char buf[FORMAT_TIMESPAN_MAX];
if (n - j->start_usec > USEC_PER_SEC && dlnow > 0) {