Fix detect logDir
Merge branch 'source'