set expiration time on lock
Merge branch 'pinglock'