diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d51017c27426c8a76580dad42745b4d6b818422..72ae00eb957127ef446cab94a83d56b90c46e4bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,9 +57,9 @@ if (WITH_DEPS) SET(OpenSSL_ROOT ${DEP_VAR}/usr/local/oceanbase/deps/devel/) # make protoc found libstdc++ - SET(PROTOC_LINK_FLAGS "-L${DEP_VAR}/usr/local/oceanbase/deps/devel/lib/ -static-libstdc++") + SET(PROTOC_LINK_FLAGS "-L${DEP_VAR}/usr/local/oceanbase/deps/devel/lib64/ -L${DEP_VAR}/usr/local/oceanbase/devtools/lib/gcc/x86_64-redhat-linux/5.2.0/ -static-libstdc++") - SET(DEP_LIB_PATH ${DEP_VAR}/usr/local/oceanbase/deps/devel/lib/ ${DEP_VAR}/usr/local/oceanbase/devtools/lib64/) + SET(DEP_LIB_PATH ${DEP_VAR}/usr/local/oceanbase/deps/devel/lib/ ${DEP_VAR}/usr/local/oceanbase/devtools/lib64/ ${DEP_VAR}/usr/local/oceanbase/devtools/lib/gcc/x86_64-redhat-linux/5.2.0/) endif () message(STATUS "DEP_VAR: ${DEP_VAR}") @@ -175,6 +175,7 @@ add_library(PROTO_OBJS OBJECT ${PROTO_SRCS} ${PROTO_HDRS}) message("protoc: ${PROTOBUF_PROTOC_EXECUTABLE}, proto srcs : ${PROTO_SRCS}") # oblogmsg +option(LOGMSG_BY_LIBOBLOG "use logmsg provide by liboblog" ON) set(LOGMSG_BY_LIBOBLOG_DEFINE "") if (LOGMSG_BY_LIBOBLOG) set(LOGMSG_BY_LIBOBLOG_DEFINE "-DLOGMSG_BY_LIBOBLOG=1") @@ -213,7 +214,7 @@ execute_process( if (NOT GIT_VERSION) message(WARNING "oblogproxy fetch git version empty, use current time as program version") - STRING(TIMESTAMP GIT_VERSION "%Y-%m-%d %H:%M:%S") + STRING(TIMESTAMP GIT_VERSION "%Y-%m-%d_%H:%M:%S") endif () if (NOT GIT_VERSION) diff --git a/deps/oblogproxy.el7.x86_64.deps b/deps/oblogproxy.el7.x86_64.deps index 8c08cada3e19596a70e99040c07692e07e3b7227..3d39c745be083c281458e8e0402c75d822327142 100644 --- a/deps/oblogproxy.el7.x86_64.deps +++ b/deps/oblogproxy.el7.x86_64.deps @@ -7,7 +7,7 @@ stable_repo=https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/ [deps] devdeps-openssl-static-1.0.1e-3.el7.x86_64.rpm devdeps-libaio-0.3.112-3.el7.x86_64.rpm -oceanbase-ce-devel-3.1.3-10100032022041510.el7.x86_64.rpm +oceanbase-ce-devel-3.1.4-10000092022071511.el7.x86_64.rpm [tools] obdevtools-gcc-5.2.0-3.el7.x86_64.rpm \ No newline at end of file diff --git a/deps/oblogproxy.el8.x86_64.deps b/deps/oblogproxy.el8.x86_64.deps index 86d51f66f8fe1027f00235ae3ace75f2ab53c230..e27a9059056ff84d0a817ad80ab41afd061992fc 100644 --- a/deps/oblogproxy.el8.x86_64.deps +++ b/deps/oblogproxy.el8.x86_64.deps @@ -7,7 +7,7 @@ stable_repo=https://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/ [deps] devdeps-openssl-static-1.0.1e-3.el8.x86_64.rpm devdeps-libaio-0.3.112-3.el8.x86_64.rpm -oceanbase-ce-devel-3.1.3-10100042022051821.el8.x86_64.rpm +oceanbase-ce-devel-3.1.4-10000092022071511.el8.x86_64.rpm [tools] obdevtools-gcc-5.2.0-3.el8.x86_64.rpm diff --git a/src/common/log.cpp b/src/common/log.cpp index 8a1e76e38d642ba375eb269d626efefa2e114f47..4bd2e4c6f1d2e969640eeccf826060bee1e24ae2 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -61,8 +61,8 @@ void init_log(const char* argv0, bool restart) google::SetLogDestination(google::GLOG_ERROR, "log/logproxy_error."); google::SetLogDestination(google::GLOG_FATAL, "log/logproxy_error."); - google::InstallFailureSignalHandler(); - google::InstallFailureWriter(dump_writer); + // google::InstallFailureSignalHandler(); + // google::InstallFailureWriter(dump_writer); FileGcRoutine log_gc("./log", {"logproxy_", bin_name + ".log"}); // log_gc.start(); diff --git a/src/obaccess/ob_mysql_packet.cpp b/src/obaccess/ob_mysql_packet.cpp index 513028dfbe689d66855580f6836974a3e4ffc90e..a9a03d2bc37d643b1764cfb5e924c7dfaad3d542 100644 --- a/src/obaccess/ob_mysql_packet.cpp +++ b/src/obaccess/ob_mysql_packet.cpp @@ -129,9 +129,9 @@ int send_mysql_packet(int fd, MsgBuf& msgbuf, uint8_t sequence) packet_length = packet_length | (sequence << 3); ////// DEBUG ONLY /////// - std::string hexstr; - dumphex((char*)&packet_length, 4, hexstr); - OMS_DEBUG << "MySQL packet header: " << hexstr << ", value: " << packet_length; +// std::string hexstr; +// dumphex((char*)&packet_length, 4, hexstr); +// OMS_DEBUG << "MySQL packet header: " << hexstr << ", value: " << packet_length; ////// DEBUG ONLY /////// int ret = writen(fd, &packet_length, 4);