A: add log and log-server
U: fix style and adapter error