[misc] Improve log

(cherry picked from commit b3ab7f81aacae5c32d1202af1d344777ee47b74e)