Merge pull request #10764 from makdharma/v1.3.x

disable mongoose on v1.3.x
pull/10912/head
makdharma 8 years ago committed by GitHub
commit dc36f4df6a
  1. 6
      WORKSPACE
  2. 1
      tools/grpcz/BUILD
  3. 8
      tools/grpcz/grpcz_client.cc

@ -77,12 +77,6 @@ local_repository(
path = "third_party/gflags",
)
git_repository(
name = "mongoose_repo",
commit = "4120a97945b41195a6223a600dae8e3b19bed19e",
remote = "https://github.com/makdharma/mongoose.git"
)
new_local_repository(
name = "submodule_benchmark",
path = "third_party/benchmark",

@ -58,6 +58,5 @@ cc_binary(
deps = [
"//external:gflags",
"monitoring_proto",
"@mongoose_repo//:mongoose_lib",
],
)

@ -38,7 +38,7 @@
#include <grpc/support/log.h>
#include "gflags/gflags.h"
#include "mongoose.h"
/* #include "mongoose.h" */
// TODO (makdharma): remove local copies of these protos
#include "tools/grpcz/census.grpc.pb.h"
@ -122,8 +122,9 @@ class GrpczClient {
std::unique_ptr<Monitoring::Stub> stub_;
};
static struct mg_serve_http_opts s_http_server_opts;
std::unique_ptr<GrpczClient> g_grpcz_client;
/*
static struct mg_serve_http_opts s_http_server_opts;
static void ev_handler(struct mg_connection *nc, int ev, void *p) {
if (ev == MG_EV_HTTP_REQUEST) {
@ -141,6 +142,7 @@ static void grpcz_handler(struct mg_connection *nc, int ev, void *ev_data) {
mg_printf(nc, "HTTP/1.0 200 OK\r\n\r\n%s", rendered_html.c_str());
nc->flags |= MG_F_SEND_AND_CLOSE;
}
*/
int main(int argc, char **argv) {
gflags::ParseCommandLineFlags(&argc, &argv, true);
@ -156,6 +158,7 @@ int main(int argc, char **argv) {
return 0;
}
/*
// Set up a mongoose webserver handler
struct mg_mgr mgr;
mg_mgr_init(&mgr, NULL);
@ -177,5 +180,6 @@ int main(int argc, char **argv) {
mg_mgr_poll(&mgr, k_sleep_millis);
}
mg_mgr_free(&mgr);
*/
return 0;
}

Loading…
Cancel
Save