Skip to content

Commit

Permalink
feat: add http_server for info collector (#442)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhao liwei authored Dec 13, 2019
1 parent 59e54d6 commit 58d9249
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rdsn
Submodule rdsn updated 37 files
+5 −2 include/dsn/c/api_utilities.h
+25 −12 include/dsn/dist/fmt_logging.h
+2 −0 include/dsn/perf_counter/perf_counters.h
+6 −0 include/dsn/tool-api/logging_provider.h
+11 −3 src/core/core/logging.cpp
+10 −0 src/core/perf_counter/perf_counters.cpp
+0 −0 src/core/tests/hostname_test.cpp
+20 −1 src/core/tests/logging.cpp
+30 −0 src/core/tests/perf_counters_test.cpp
+8 −0 src/core/tools/common/shared_io_service.h
+30 −0 src/core/tools/common/simple_logger.cpp
+12 −0 src/core/tools/common/simple_logger.h
+3 −0 src/dist/http/http_server.cpp
+45 −0 src/dist/http/perf_counter_http_service.cpp
+28 −0 src/dist/http/perf_counter_http_service.h
+65 −0 src/dist/http/test/perf_counter_http_service_test.cpp
+39 −0 src/dist/replication/lib/duplication/replica_duplicator_manager.cpp
+13 −0 src/dist/replication/lib/duplication/replica_duplicator_manager.h
+87 −0 src/dist/replication/lib/duplication/test/replica_duplicator_manager_test.cpp
+123 −0 src/dist/replication/lib/duplication/test/replica_duplicator_test.cpp
+5 −0 src/dist/replication/lib/replica.h
+15 −7 src/dist/replication/lib/replica_check.cpp
+39 −7 src/dist/replication/lib/replica_chkpt.cpp
+10 −13 src/dist/replication/lib/replica_init.cpp
+1 −1 src/dist/replication/lib/replica_stub.cpp
+43 −43 src/dist/replication/meta_server/meta_backup_service.cpp
+11 −3 src/dist/replication/meta_server/meta_backup_service.h
+63 −2 src/dist/replication/meta_server/meta_http_service.cpp
+7 −0 src/dist/replication/meta_server/meta_http_service.h
+13 −13 src/dist/replication/meta_server/meta_service.cpp
+2 −1 src/dist/replication/meta_server/meta_service.h
+20 −9 src/dist/replication/meta_server/server_state.cpp
+4 −4 src/dist/replication/test/meta_test/unit_test/backup_test.cpp
+1 −0 src/dist/replication/test/meta_test/unit_test/config-test.ini
+106 −0 src/dist/replication/test/meta_test/unit_test/meta_http_service_test.cpp
+7 −0 src/dist/replication/test/meta_test/unit_test/meta_service_test_app.h
+24 −0 src/dist/replication/test/meta_test/unit_test/state_sync_test.cpp
2 changes: 1 addition & 1 deletion src/server/info_collector_app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace pegasus {
namespace server {

info_collector_app::info_collector_app(const dsn::service_app_info *info)
: service_app(info), _updater_started(false)
: service_app(info), _updater_started(false), _http_server(new ::dsn::http_server())
{
}

Expand Down
2 changes: 2 additions & 0 deletions src/server/info_collector_app.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#pragma once

#include <dsn/cpp/service_app.h>
#include <dsn/tool-api/http_server.h>
#include "info_collector.h"
#include "available_detector.h"

Expand All @@ -24,6 +25,7 @@ class info_collector_app : public ::dsn::service_app
info_collector _collector;
available_detector _detector;
bool _updater_started;
std::unique_ptr<::dsn::http_server> _http_server;
};
}
} // namespace

0 comments on commit 58d9249

Please sign in to comment.