Adjust the method to record log.
Merge branch 'pomelyu'