Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTTP service for replica server #360

Merged
merged 8 commits into from
Aug 7, 2019
Merged

HTTP service for replica server #360

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6cc9160
Merge pull request #1 from XiaoMi/master
Skysheepwang Jul 24, 2019
d83c968
add arguments for replica http service
Skysheepwang Jul 24, 2019
495c4b3
delete useless comments
Skysheepwang Jul 25, 2019
5d5c19e
Merge branch 'master' into master
acelyc111 Jul 26, 2019
3b0baac
add arguments for replica http service
Skysheepwang Jul 26, 2019
56f691c
Merge branch 'master' of https://github.com/Skysheepwang/pegasus
Skysheepwang Jul 26, 2019
14302ac
Merge branch 'master' into master
acelyc111 Aug 1, 2019
962906a
Merge branch 'master' into master
acelyc111 Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/server/pegasus_service_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#include <dsn/dist/replication/meta_service_app.h>
#include <dsn/dist/replication/replication_service_app.h>
#include <pegasus/version.h>
#include <pegasus/git_commit.h>
#include "reporter/pegasus_counter_reporter.h"

namespace pegasus {
Expand All @@ -22,7 +24,11 @@ class pegasus_replication_service_app : public ::dsn::replication::replication_s

virtual ::dsn::error_code start(const std::vector<std::string> &args) override
{
::dsn::error_code ret = ::dsn::replication::replication_service_app::start(args);
// args for replication http service
std::vector<std::string> 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;
Expand Down