[misc] Better log

(cherry picked from commit b45472ce2fd23653ec8a1de0cee8225c3b684c6d)