Skip to content

clamd: Debug Logs - Size, time and status of each file scan #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −0
Open

clamd: Debug Logs - Size, time and status of each file scan #1633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions clamd/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,17 @@ cl_error_t scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_
context.filename = filename;
context.virsize = 0;
context.scandata = scandata;

struct timeval scan_start, scan_end;
gettimeofday(&scan_start, NULL);
off_t file_size = sb ? sb->st_size : 0;

ret = cl_scanfile_callback(filename, &virname, &scandata->scanned, scandata->engine, scandata->options, &context);

gettimeofday(&scan_end, NULL);
double scan_time_ms = (scan_end.tv_sec - scan_start.tv_sec) * 1000.0 +
(scan_end.tv_usec - scan_start.tv_usec) / 1000.0;

thrmgr_setactivetask(NULL, NULL);

if (thrmgr_group_need_terminate(scandata->conn->group)) {
Expand Down Expand Up @@ -315,16 +325,24 @@ cl_error_t scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_
else
logg(LOGG_INFO, "%s: %s FOUND\n", filename, virname);
}
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=INFECTED\n",
filename, (long long)file_size, scan_time_ms);
} else if (ret != CL_CLEAN) {
scandata->errors++;
if (conn_reply(scandata->conn, filename, cl_strerror(ret), "ERROR") == -1) {
free(filename);
return CL_ETIMEOUT;
}
logg(LOGG_INFO, "%s: %s ERROR\n", filename, cl_strerror(ret));
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=ERROR\n",
filename, (long long)file_size, scan_time_ms);
} else if (logok) {
logg(LOGG_INFO, "%s: OK\n", filename);
}
if (ret == CL_CLEAN) {
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=CLEAN\n",
filename, (long long)file_size, scan_time_ms);
}

free(filename);

Expand Down Expand Up @@ -427,7 +445,17 @@ cl_error_t scanfd(
context.filename = fdstr;
context.virsize = 0;
context.scandata = NULL;

struct timeval scan_start, scan_end;
gettimeofday(&scan_start, NULL);
off_t file_size = statbuf.st_size;

ret = cl_scandesc_callback(fd, log_filename, &virname, scanned, engine, options, &context);

gettimeofday(&scan_end, NULL);
double scan_time_ms = (scan_end.tv_sec - scan_start.tv_sec) * 1000.0 +
(scan_end.tv_usec - scan_start.tv_usec) / 1000.0;

thrmgr_setactivetask(NULL, NULL);

if (thrmgr_group_need_terminate(conn->group)) {
Expand All @@ -444,15 +472,21 @@ cl_error_t scanfd(
logg(LOGG_INFO, "%s: %s(%s:%llu) FOUND\n", log_filename, virname, context.virhash, context.virsize);
else
logg(LOGG_INFO, "%s: %s FOUND\n", log_filename, virname);
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=INFECTED\n",
log_filename, (long long)file_size, scan_time_ms);
} else if (ret != CL_CLEAN) {
if (conn_reply(conn, reply_fdstr, cl_strerror(ret), "ERROR") == -1)
ret = CL_ETIMEOUT;
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=ERROR\n",
log_filename, (long long)file_size, scan_time_ms);
logg(LOGG_INFO, "%s: %s ERROR\n", log_filename, cl_strerror(ret));
} else {
if (conn_reply_single(conn, reply_fdstr, "OK") == CL_ETIMEOUT)
ret = CL_ETIMEOUT;
if (logok)
logg(LOGG_INFO, "%s: OK\n", log_filename);
logg(LOGG_DEBUG, "METRICS: file=%s size=%lld time_ms=%.3f result=CLEAN\n",
log_filename, (long long)file_size, scan_time_ms);
}

done:
Expand Down