diff --git a/configure/ConfigGroup.cpp b/configure/ConfigGroup.cpp index 4acf1c54686974e971c0e675c9961e5302da22fb..490bf6124142a6a2f99d42693c2094915713fd20 100644 --- a/configure/ConfigGroup.cpp +++ b/configure/ConfigGroup.cpp @@ -102,7 +102,7 @@ namespace comcfg{ } ++p; } - LOG(INFO) << "Config: this=" << this << ", Set _name = " << __name << ", _father = " << __father << "[" << __father->getName() <<"]"; + LOG(INFO) << "Config: this=" << this << ", Set _name = " << __name << ", _father = " << __father << "[" << (__father==NULL?"NULL":__father->getName()) <<"]"; _name = __name; _father = __father; fieldMap.create(256); diff --git a/predictor/proto/CMakeLists.txt b/predictor/proto/CMakeLists.txt index b24ff17ebc02c407a2131f32e91db241ef88e4cf..acf9e0e4bfe69a6214548fc03aa3e2216489b72f 100644 --- a/predictor/proto/CMakeLists.txt +++ b/predictor/proto/CMakeLists.txt @@ -14,7 +14,6 @@ LIST(APPEND protofiles ${CMAKE_CURRENT_LIST_DIR}/./xrecord_format.proto ) -# PROTOBUF_GENERATE_SERVING_CPP(PROTO_SRCS PROTO_HDRS ${protofiles}) -PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${protofiles}) +PROTOBUF_GENERATE_SERVING_CPP(PROTO_SRCS PROTO_HDRS ${protofiles}) LIST(APPEND pdserving_srcs ${PROTO_SRCS} ${pdcodegen_proto_srcs}) LIST(APPEND pdclient_srcs ${PROTO_SRCS} ${pdcodegen_proto_srcs}) diff --git a/predictor/src/pdcodegen.cpp b/predictor/src/pdcodegen.cpp index 8d9bdff40bd9978d5aa07c7b27c7d5c08e870141..85e5f3b69d65dec84db6bfb7efac4e3920cb04c4 100644 --- a/predictor/src/pdcodegen.cpp +++ b/predictor/src/pdcodegen.cpp @@ -261,10 +261,10 @@ private: " cntl->SetFailed(404, \"Not found service: $service$\");\n" " return ;\n" " }\n" - " LOG(NOTICE) << \" remote_side=\[\" << cntl->remote_side() << \"\]\";\n" - " LOG(NOTICE) << \" local_side=\[\" << cntl->local_side() << \"\]\";\n" - " LOG(NOTICE) << \" service_name=\[\" << \"$name$\" << \"\]\";\n" - " LOG(NOTICE) << \" log_id=\[\" << cntl->log_id() << \"\]\";\n" + " LOG(INFO) << \" remote_side=\[\" << cntl->remote_side() << \"\]\";\n" + " LOG(INFO) << \" local_side=\[\" << cntl->local_side() << \"\]\";\n" + " LOG(INFO) << \" service_name=\[\" << \"$name$\" << \"\]\";\n" + " LOG(INFO) << \" log_id=\[\" << cntl->log_id() << \"\]\";\n" " int err_code = svr->inference(request, response);\n" " if (err_code != 0) {\n" " LOG(WARNING)\n" @@ -275,7 +275,7 @@ private: " gettimeofday(&tv, NULL);\n" " long end = tv.tv_sec * 1000000 + tv.tv_usec;\n" " // flush notice log\n" - " LOG(NOTICE) << \" tc=\[\" << (end - start) << \"\]\";\n", + " LOG(INFO) << \" tc=\[\" << (end - start) << \"\]\";\n", "name", class_name, "service", service_name); } if (m->name() == "debug") { @@ -290,10 +290,10 @@ private: " cntl->SetFailed(404, \"Not found service: $service$\");\n" " return ;\n" " }\n" - " LOG(NOTICE) << \" remote_side=\[\" << cntl->remote_side() << \"\]\";\n" - " LOG(NOTICE) << \" local_side=\[\" << cntl->local_side() << \"\]\";\n" - " LOG(NOTICE) << \" service_name=\[\" << \"$name$\" << \"\]\";\n" - " LOG(NOTICE) << \" log_id=\[\" << cntl->log_id() << \"\]\";\n" + " LOG(INFO) << \" remote_side=\[\" << cntl->remote_side() << \"\]\";\n" + " LOG(INFO) << \" local_side=\[\" << cntl->local_side() << \"\]\";\n" + " LOG(INFO) << \" service_name=\[\" << \"$name$\" << \"\]\";\n" + " LOG(INFO) << \" log_id=\[\" << cntl->log_id() << \"\]\";\n" " butil::IOBufBuilder debug_os;\n" " int err_code = svr->inference(request, response, &debug_os);\n" " if (err_code != 0) {\n" @@ -306,7 +306,7 @@ private: " gettimeofday(&tv, NULL);\n" " long end = tv.tv_sec * 1000000 + tv.tv_usec;\n" " // flush notice log\n" - " LOG(NOTICE) << \" tc=\[\" << (end - start) << \"\]\";\n" + " LOG(INFO) << \" tc=\[\" << (end - start) << \"\]\";\n" " LOG(INFO)\n" " << \"TC=[\" << (end - start) << \"] Received debug request[log_id=\" << cntl->log_id()\n" " << \"] from \" << cntl->remote_side()\n"