Merge pull request #3205 from jianhan-he/master

fix eagle error and add log