diff --git a/rdsn b/rdsn
index be1bdfe95fc96484b0bcdae31ce621c0d122ec7d..c1e43b4e040847c8fbbbb83a4409265ab026d41d 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit be1bdfe95fc96484b0bcdae31ce621c0d122ec7d
+Subproject commit c1e43b4e040847c8fbbbb83a4409265ab026d41d
diff --git a/src/client_lib/pegasus_client_factory_impl.cpp b/src/client_lib/pegasus_client_factory_impl.cpp
index 89818a3a97708550bf8665089ed1445e0b2df1c2..4401ae73197a8fb4e1d16f973c49e2573f48d998 100644
--- a/src/client_lib/pegasus_client_factory_impl.cpp
+++ b/src/client_lib/pegasus_client_factory_impl.cpp
@@ -4,11 +4,6 @@
 
 #include "pegasus_client_factory_impl.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.client.factory.impl"
-
 namespace pegasus {
 namespace client {
 
diff --git a/src/client_lib/pegasus_client_impl.cpp b/src/client_lib/pegasus_client_impl.cpp
index b025888451f83924622d8b8c26e623b0e949be50..880fa23640ba3bdc4023dddde4c5cb474d46aed2 100644
--- a/src/client_lib/pegasus_client_impl.cpp
+++ b/src/client_lib/pegasus_client_impl.cpp
@@ -15,11 +15,6 @@
 #include <pegasus_utils.h>
 #include "pegasus_client_impl.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.client.impl"
-
 using namespace ::dsn;
 
 namespace pegasus {
diff --git a/src/client_lib/pegasus_scanner_impl.cpp b/src/client_lib/pegasus_scanner_impl.cpp
index 72296a29b81efd20a9188ee0ba4ea0de4116e78f..b80ae22f956fc964fbd6c778278f109a82658679 100644
--- a/src/client_lib/pegasus_scanner_impl.cpp
+++ b/src/client_lib/pegasus_scanner_impl.cpp
@@ -5,11 +5,6 @@
 #include "pegasus_client_impl.h"
 #include <pegasus_const.h>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.scanner.impl"
-
 using namespace ::dsn;
 using namespace pegasus;
 
diff --git a/src/redis_protocol/proxy_lib/proxy_layer.cpp b/src/redis_protocol/proxy_lib/proxy_layer.cpp
index ef796dadf8f158417f164961ead48608579d804d..f6152904099dbc028eb539a2369c6d0c04779a52 100644
--- a/src/redis_protocol/proxy_lib/proxy_layer.cpp
+++ b/src/redis_protocol/proxy_lib/proxy_layer.cpp
@@ -4,11 +4,6 @@
 
 #include "proxy_layer.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.rproxy.layer"
-
 namespace pegasus {
 namespace proxy {
 
diff --git a/src/redis_protocol/proxy_lib/redis_parser.cpp b/src/redis_protocol/proxy_lib/redis_parser.cpp
index 0faf49b38b75b0da1fe417cf9273026fbb3e7134..8c45c1ab8b1209b143399c14a407c5ced52ff47d 100644
--- a/src/redis_protocol/proxy_lib/redis_parser.cpp
+++ b/src/redis_protocol/proxy_lib/redis_parser.cpp
@@ -10,11 +10,6 @@
 #include <pegasus_utils.h>
 #include "redis_parser.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.rproxy.parser"
-
 #define CR '\015'
 #define LF '\012'
 
diff --git a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
index abfc04317e2c212384fb7ddaea012cbd1f327084..32a4dd1bd9a2286814eb55e9cdf6e14b024a25f8 100644
--- a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
+++ b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
@@ -13,12 +13,6 @@
 #include "proxy_layer.h"
 #include "redis_parser.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-
-#define __TITLE__ "pegasus.rproxy.test"
-
 using namespace boost::asio;
 using namespace ::pegasus::proxy;
 
diff --git a/src/server/available_detector.cpp b/src/server/available_detector.cpp
index 46e869502678eff056fbeb8c8e29e2ce13f23478..9e26ae8096b9f6310ae34f23d33e107b5110dd60 100644
--- a/src/server/available_detector.cpp
+++ b/src/server/available_detector.cpp
@@ -9,11 +9,6 @@
 #include <iomanip>
 #include <algorithm>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "available.detector"
-
 namespace pegasus {
 namespace server {
 
diff --git a/src/server/info_collector.cpp b/src/server/info_collector.cpp
index 9dde9abfbd289fac5b095eb6f98b8f60a2bd0f03..58f4b115161ad061cb37891ec86f0cfcf641af6a 100644
--- a/src/server/info_collector.cpp
+++ b/src/server/info_collector.cpp
@@ -11,11 +11,6 @@
 #include <cstdlib>
 #include <iomanip>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "info.collector"
-
 #define METRICSNUM 3
 
 using namespace ::dsn;
diff --git a/src/server/info_collector_app.cpp b/src/server/info_collector_app.cpp
index 8bca99e9d9dd789704d8b07346f863225ddf8cdf..3f273a82e1fcfc57b43f9392efbd12e92bf43032 100644
--- a/src/server/info_collector_app.cpp
+++ b/src/server/info_collector_app.cpp
@@ -12,11 +12,6 @@
 #include <fstream>
 #include <iomanip>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "info.collector.app"
-
 namespace pegasus {
 namespace server {
 
diff --git a/src/server/main.cpp b/src/server/main.cpp
index ac59b0d551bed3e617b2e2550fa7eb1d0965ab92..743addee18bb6eed064b1c8e6fd3cd020ac4480f 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -22,11 +22,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.server.main"
-
 #define STR_I(var) #var
 #define STR(var) STR_I(var)
 #ifndef DSN_BUILD_TYPE
diff --git a/src/server/pegasus_counter_updater.cpp b/src/server/pegasus_counter_updater.cpp
index c781f68957f6e5c3d4c27fbaab4b705653b5dae5..8265b2623d6bba9f666842d44d7ccd4c41fc86f0 100644
--- a/src/server/pegasus_counter_updater.cpp
+++ b/src/server/pegasus_counter_updater.cpp
@@ -18,11 +18,6 @@
 #include <fstream>
 #endif
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.counter.updater"
-
 using namespace ::dsn;
 
 namespace pegasus {
@@ -62,7 +57,7 @@ static void libevent_log(int severity, const char *msg)
         level = LOG_LEVEL_WARNING;
     else
         level = LOG_LEVEL_ERROR;
-    dlog(level, __TITLE__, msg);
+    dlog(level, msg);
 }
 
 #if defined(__linux__)
diff --git a/src/server/pegasus_perf_counter.cpp b/src/server/pegasus_perf_counter.cpp
index cb1bad97215662cd0cca43a08501c1fa027910a6..d9a6f398c4b15958e3e8c4cc412f8d50db2f0c2b 100644
--- a/src/server/pegasus_perf_counter.cpp
+++ b/src/server/pegasus_perf_counter.cpp
@@ -7,11 +7,6 @@
 
 #include <atomic>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.perf.counter"
-
 using namespace ::dsn;
 using namespace ::dsn::tools;
 
diff --git a/src/server/pegasus_server_impl.cpp b/src/server/pegasus_server_impl.cpp
index 1da24620973852d3b9ce2a3250bcad9a38e8b87d..4397fc7ad4d9bae3d2eb3ab3015ccc59e461fc69 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -13,11 +13,6 @@
 #include <boost/lexical_cast.hpp>
 #include <algorithm>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.server.impl"
-
 namespace pegasus {
 namespace server {
 
diff --git a/src/shell/config.ini b/src/shell/config.ini
index 254d78953ecbbc0a755c2b6d12afbb539f04c57e..378686835bc1e76fb9e9ecf9ecb6df2cd114e62d 100644
--- a/src/shell/config.ini
+++ b/src/shell/config.ini
@@ -36,7 +36,7 @@ enable_default_app_mimic = true
 data_dir = ./pegasus_shell.data
 
 [tools.simple_logger]
-short_header = true
+short_header = false
 fast_flush = true
 max_number_of_log_files_on_disk = 10
 stderr_start_level = LOG_LEVEL_FATAL
diff --git a/src/test/function_test/main.cpp b/src/test/function_test/main.cpp
index ce1d173db72404ef4441293aec602f784d10b5e0..e6bf959707424d54ad3d4d426f49ab9901b9b738 100644
--- a/src/test/function_test/main.cpp
+++ b/src/test/function_test/main.cpp
@@ -12,11 +12,6 @@
 #include <pegasus/client.h>
 #include <gtest/gtest.h>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.main"
-
 using namespace ::pegasus;
 
 pegasus_client *client = nullptr;
diff --git a/src/test/function_test/test_basic.cpp b/src/test/function_test/test_basic.cpp
index 08913578b5ff285ecad549319d1d8c2be9a9e67e..dca6b119a87b4d2f21ecf176f1c9150c6784bc14 100644
--- a/src/test/function_test/test_basic.cpp
+++ b/src/test/function_test/test_basic.cpp
@@ -14,11 +14,6 @@
 #include <gtest/gtest.h>
 #include <atomic>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.basic"
-
 using namespace ::pegasus;
 
 extern pegasus_client *client;
diff --git a/src/test/function_test/test_recall.cpp b/src/test/function_test/test_recall.cpp
index 42c0587dea22d7c1e01a39f7f07449be01213dff..e6f699e5b1b3db761fc646bb9d426be6edadfcd2 100644
--- a/src/test/function_test/test_recall.cpp
+++ b/src/test/function_test/test_recall.cpp
@@ -18,11 +18,6 @@
 
 #include "utils.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.recall"
-
 using namespace dsn::replication;
 
 TEST(drop_and_recall, simple)
diff --git a/src/test/function_test/test_recovery.cpp b/src/test/function_test/test_recovery.cpp
index d5e2fbae486e8a612f7dee5be06e62769e12da0c..555cdda67eddb11d8bb0335ef242796666ebf682 100644
--- a/src/test/function_test/test_recovery.cpp
+++ b/src/test/function_test/test_recovery.cpp
@@ -18,11 +18,6 @@
 
 #include "global_env.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.recovery"
-
 using namespace dsn::replication;
 
 class recovery_test : public testing::Test
diff --git a/src/test/function_test/test_restore.cpp b/src/test/function_test/test_restore.cpp
index b5c563e9d596d1b5025d956e6499ce93d9428e1e..1dfcd542e97287a011325cd52eef682033bf96aa 100644
--- a/src/test/function_test/test_restore.cpp
+++ b/src/test/function_test/test_restore.cpp
@@ -8,11 +8,6 @@
 
 #include "global_env.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.restore"
-
 using namespace ::dsn;
 using namespace ::dsn::replication;
 using namespace pegasus;
diff --git a/src/test/function_test/test_scan.cpp b/src/test/function_test/test_scan.cpp
index 6e09eb38ebf973707c6ebfe3c21f5f66b433148a..30c60e62e2fa25a9dac199dc7c449b6926e5135a 100644
--- a/src/test/function_test/test_scan.cpp
+++ b/src/test/function_test/test_scan.cpp
@@ -12,11 +12,6 @@
 #include <pegasus/client.h>
 #include <gtest/gtest.h>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.scan"
-
 using namespace ::pegasus;
 
 extern pegasus_client *client;
diff --git a/src/test/function_test/test_slog_lost.cpp b/src/test/function_test/test_slog_lost.cpp
index 03e07e7d35d49fe09a27d4f13b7370239b0b54bf..886ad6b890f0b78d4354228474ab9ccce090861d 100644
--- a/src/test/function_test/test_slog_lost.cpp
+++ b/src/test/function_test/test_slog_lost.cpp
@@ -18,11 +18,6 @@
 #include "global_env.h"
 #include "utils.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "function.test.recall"
-
 using namespace dsn::replication;
 
 static const std::string table_for_lost_log = "table_for_lost_log";
diff --git a/src/test/kill_test/data_verifier.cpp b/src/test/kill_test/data_verifier.cpp
index 7f038bf97051481ab15c39dd2d09b2a6c9873b35..e2acbb41e7f8731181878e58babfdf6179496adf 100644
--- a/src/test/kill_test/data_verifier.cpp
+++ b/src/test/kill_test/data_verifier.cpp
@@ -45,11 +45,6 @@ static const long stat_p999_pos = stat_batch - stat_batch / 1000 - 1;
 static const long stat_p9999_pos = stat_batch - stat_batch / 10000 - 1;
 static const long stat_max_pos = stat_batch - 1;
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.verifier"
-
 // return time in us.
 long get_time()
 {
diff --git a/src/test/kill_test/job.cpp b/src/test/kill_test/job.cpp
index 542187ab23679ccf71218bc553ab9d23322469b4..893ceba042df4956d2ad9e15ecc8ed17be6f34a7 100644
--- a/src/test/kill_test/job.cpp
+++ b/src/test/kill_test/job.cpp
@@ -4,11 +4,6 @@
 
 #include "job.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "killtest.job"
-
 namespace pegasus {
 namespace test {
 
diff --git a/src/test/kill_test/kill_testor.cpp b/src/test/kill_test/kill_testor.cpp
index c58ec97de89d0de6f85bff92543c9e8cdd40adaa..ea69d118f397abf89c262605337c834727fbeb84 100644
--- a/src/test/kill_test/kill_testor.cpp
+++ b/src/test/kill_test/kill_testor.cpp
@@ -8,11 +8,6 @@
 
 #include "kill_testor.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "kill.testor"
-
 namespace pegasus {
 namespace test {
 
diff --git a/src/test/kill_test/killer_handler_shell.cpp b/src/test/kill_test/killer_handler_shell.cpp
index f56a95890a150079070d779af352fa3258f45ae5..5a025e87b287718a45b1e49b62767b88cda976d4 100644
--- a/src/test/kill_test/killer_handler_shell.cpp
+++ b/src/test/kill_test/killer_handler_shell.cpp
@@ -10,11 +10,6 @@
 #include <fstream>
 #include <dsn/c/api_utilities.h>
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "killer.handler.shell"
-
 namespace pegasus {
 namespace test {
 
diff --git a/src/test/kill_test/process_killer.cpp b/src/test/kill_test/process_killer.cpp
index a045b1672e670dd9f0bfce7a2c775babe8bf8f1d..08125053122162ba4ff43905858a5e5113ff5ec3 100644
--- a/src/test/kill_test/process_killer.cpp
+++ b/src/test/kill_test/process_killer.cpp
@@ -21,11 +21,6 @@
 #include "kill_testor.h"
 #include "process_killer.h"
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.killer"
-
 using namespace std;
 using namespace ::pegasus;
 using namespace ::pegasus::test;
diff --git a/src/test/pressure_test/main.cpp b/src/test/pressure_test/main.cpp
index 42fa37e675f72e3c2517e64e27b7cafb5b4cc15b..def3b17f3ebda9cc56e0bc4cb467a69301304743 100644
--- a/src/test/pressure_test/main.cpp
+++ b/src/test/pressure_test/main.cpp
@@ -18,11 +18,6 @@
 using namespace std;
 using namespace ::pegasus;
 
-#ifdef __TITLE__
-#undef __TITLE__
-#endif
-#define __TITLE__ "pegasus.pressure.test"
-
 DEFINE_TASK_CODE(LPC_DEFAUT_TASK, TASK_PRIORITY_COMMON, dsn::THREAD_POOL_DEFAULT)
 
 //[min, max], min and max is unsigned