log refactor,3.5