Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

worker.cpp

@@ -262,6 +262,7 @@ struct worker_impl:worker
 		{
 			m_timer_worker->async_stop();
 			m_timer_worker->join();
+			m_timer_worker.reset(nullptr);
 		}
 
 		int exp=0;