From d83c968e72dedec1dd582209d016a8405c637072 Mon Sep 17 00:00:00 2001 From: Skysheepwang Date: Wed, 24 Jul 2019 15:42:28 +0800 Subject: [PATCH 1/3] add arguments for replica http service --- src/server/pegasus_service_app.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/pegasus_service_app.h b/src/server/pegasus_service_app.h index cf95f1affb..678282fc18 100644 --- a/src/server/pegasus_service_app.h +++ b/src/server/pegasus_service_app.h @@ -6,6 +6,8 @@ #include #include +#include // for http service +#include // for http service #include "reporter/pegasus_counter_reporter.h" namespace pegasus { @@ -22,7 +24,11 @@ class pegasus_replication_service_app : public ::dsn::replication::replication_s virtual ::dsn::error_code start(const std::vector &args) override { - ::dsn::error_code ret = ::dsn::replication::replication_service_app::start(args); + // args for replication http service + std::vector args_new(args); + args_new.emplace_back(PEGASUS_VERSION); + args_new.emplace_back(PEGASUS_GIT_COMMIT); + ::dsn::error_code ret = ::dsn::replication::replication_service_app::start(args_new); if (ret == ::dsn::ERR_OK) { pegasus_counter_reporter::instance().start(); _updater_started = true; From 495c4b3e55619e85a1af19eeaff91e920a956b1a Mon Sep 17 00:00:00 2001 From: Skysheepwang Date: Thu, 25 Jul 2019 10:04:10 +0800 Subject: [PATCH 2/3] delete useless comments --- src/server/pegasus_service_app.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/pegasus_service_app.h b/src/server/pegasus_service_app.h index 678282fc18..a8ad0bfb6e 100644 --- a/src/server/pegasus_service_app.h +++ b/src/server/pegasus_service_app.h @@ -6,8 +6,8 @@ #include #include -#include // for http service -#include // for http service +#include +#include #include "reporter/pegasus_counter_reporter.h" namespace pegasus { From 3b0baaca19a4d087c4233d34b9e66eccd59aaad3 Mon Sep 17 00:00:00 2001 From: Skysheepwang Date: Fri, 26 Jul 2019 15:43:50 +0800 Subject: [PATCH 3/3] add arguments for replica http service --- src/server/pegasus_service_app.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/pegasus_service_app.h b/src/server/pegasus_service_app.h index a8ad0bfb6e..c8243a8adf 100644 --- a/src/server/pegasus_service_app.h +++ b/src/server/pegasus_service_app.h @@ -29,6 +29,7 @@ class pegasus_replication_service_app : public ::dsn::replication::replication_s args_new.emplace_back(PEGASUS_VERSION); args_new.emplace_back(PEGASUS_GIT_COMMIT); ::dsn::error_code ret = ::dsn::replication::replication_service_app::start(args_new); + if (ret == ::dsn::ERR_OK) { pegasus_counter_reporter::instance().start(); _updater_started = true; @@ -59,7 +60,12 @@ class pegasus_meta_service_app : public ::dsn::service::meta_service_app virtual ::dsn::error_code start(const std::vector &args) override { - ::dsn::error_code ret = ::dsn::service::meta_service_app::start(args); + // args for meta http service + std::vector args_new(args); + args_new.emplace_back(PEGASUS_VERSION); + args_new.emplace_back(PEGASUS_GIT_COMMIT); + ::dsn::error_code ret = ::dsn::service::meta_service_app::start(args_new); + if (ret == ::dsn::ERR_OK) { pegasus_counter_reporter::instance().start(); _updater_started = true;