Cleanup connection handler, add session logs (#1216)

Cleanup connection handler, add session logs (#1216) #462