Added a sanity check on the log file
Merge branch 'master' into fix-logging-handler
touch_log_file must be done always
Merged from master
Merge pull request #1623 from gem/fix-logging-handler

Sanity check to make sure that the log file is non-empty