Log streaming logic update
Merge pull request #415 from jhadvig/logging_fix

Merged by openshift-bot