log upload to 6 hour, fix locked log
Master merged into Logger.