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.

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

Unify StatusHttpHandler and add git_info_sha information #1573

Merged
merged 2 commits into from
Jan 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/daemons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ nebula_add_executable(
GraphDaemon.cpp
OBJECTS
$<TARGET_OBJECTS:filter_obj>
$<TARGET_OBJECTS:graph_http_handler>
$<TARGET_OBJECTS:graph_obj>
$<TARGET_OBJECTS:http_client_obj>
$<TARGET_OBJECTS:parser_obj>
Expand Down
5 changes: 0 additions & 5 deletions src/daemons/GraphDaemon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "process/ProcessUtils.h"
#include <thrift/lib/cpp2/server/ThriftServer.h>
#include "graph/GraphService.h"
#include "graph/GraphHttpHandler.h"
#include "graph/GraphFlags.h"
#include "webservice/WebService.h"

Expand Down Expand Up @@ -95,10 +94,6 @@ int main(int argc, char *argv[]) {
}

LOG(INFO) << "Starting Graph HTTP Service";
// http://127.0.0.1:XXXX/status is equivalent to http://127.0.0.1:XXXX
nebula::WebService::registerHandler("/status", [] {
return new nebula::graph::GraphHttpHandler();
});
status = nebula::WebService::start();
if (!status.ok()) {
return EXIT_FAILURE;
Expand Down
4 changes: 0 additions & 4 deletions src/daemons/MetaDaemon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <thrift/lib/cpp2/server/ThriftServer.h>
#include "meta/MetaServiceHandler.h"
#include "meta/MetaHttpIngestHandler.h"
#include "meta/MetaHttpStatusHandler.h"
#include "meta/MetaHttpDownloadHandler.h"
#include "meta/MetaHttpReplaceHostHandler.h"
#include "webservice/WebService.h"
Expand Down Expand Up @@ -134,9 +133,6 @@ bool initWebService(nebula::kvstore::KVStore* kvstore,
nebula::hdfs::HdfsCommandHelper* helper,
nebula::thread::GenericThreadPool* pool) {
LOG(INFO) << "Starting Meta HTTP Service";
nebula::WebService::registerHandler("/status", [] {
return new nebula::meta::MetaHttpStatusHandler();
});
nebula::WebService::registerHandler("/download-dispatch", [kvstore, helper, pool] {
auto handler = new nebula::meta::MetaHttpDownloadHandler();
handler->init(kvstore, helper, pool);
Expand Down
6 changes: 0 additions & 6 deletions src/graph/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,5 @@ nebula_add_library(
CreateSnapshotExecutor.cpp
DropSnapshotExecutor.cpp
)

nebula_add_library(
graph_http_handler OBJECT
GraphHttpHandler.cpp
)

nebula_add_subdirectory(test)

143 changes: 0 additions & 143 deletions src/graph/GraphHttpHandler.cpp

This file was deleted.

55 changes: 0 additions & 55 deletions src/graph/GraphHttpHandler.h

This file was deleted.

23 changes: 0 additions & 23 deletions src/graph/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,6 @@ nebula_add_test(
gtest
)

nebula_add_test(
NAME
graph_http_test
SOURCES
GraphHttpHandlerTest.cpp
OBJECTS
$<TARGET_OBJECTS:graph_test_common_obj>
$<TARGET_OBJECTS:graph_http_handler>
$<TARGET_OBJECTS:ws_obj>
$<TARGET_OBJECTS:client_cpp_obj>
$<TARGET_OBJECTS:stats_obj>
$<TARGET_OBJECTS:process_obj>
$<TARGET_OBJECTS:adHocSchema_obj>
${GRAPH_TEST_LIBS}
LIBRARIES
proxygenhttpserver
proxygenlib
${THRIFT_LIBRARIES}
${ROCKSDB_LIBRARIES}
wangle
gtest
)

nebula_add_test(
NAME
data_test
Expand Down
106 changes: 0 additions & 106 deletions src/graph/test/GraphHttpHandlerTest.cpp

This file was deleted.

Loading