use SERVER_NAME instead of SERVER_ADDR

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Merge branch 'legacy'