Merge "fix the way to get log filename"