diff --git a/deps/Makefile b/deps/Makefile index 1d722bb2d..2c6ab8907 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -11,9 +11,9 @@ endif PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE)) ifeq ($(PROXYSQLCLICKHOUSE),1) -default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd curl ev coredumper libssl +default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd curl ev libssl else -default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre microhttpd curl ev coredumper libssl +default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre microhttpd curl ev libssl endif .PHONY: default @@ -33,13 +33,6 @@ libev/libev/.libs/libev.a: cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} ev: libev/libev/.libs/libev.a -google-coredumper/google-coredumper/.libs/libcoredumper.a: - cd google-coredumper && rm -rf google-coredumper || true - cd google-coredumper && tar -zxf google-coredumper.tar.gz - cd google-coredumper/google-coredumper && ./configure && CC=${CC} CXX=${CXX} ${MAKE} -coredumper: google-coredumper/google-coredumper/.libs/libcoredumper.a - - curl/curl/lib/.libs/libcurl.a: #libssl/openssl/libssl.a cd curl && rm -rf curl-7.57.0 || true cd curl && tar -zxf curl-7.57.0.tar.gz @@ -177,7 +170,6 @@ cleanall: cd lz4 && rm -rf lz4-1.7.5 || true cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true cd curl && rm -rf curl-7.57.0 || true - cd google-coredumper && rm -rf google-coredumper || true cd libev && rm -rf libev-4.24 || true cd libssl && rm -rf openssl-1.1.0h || true cd libssl && rm -rf openssl-1.1.1b || true diff --git a/deps/google-coredumper/google-coredumper.tar.gz b/deps/google-coredumper/google-coredumper.tar.gz deleted file mode 100644 index f862c52b6..000000000 Binary files a/deps/google-coredumper/google-coredumper.tar.gz and /dev/null differ diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h index 67cdcb6b3..78884e22c 100644 --- a/include/proxysql_structs.h +++ b/include/proxysql_structs.h @@ -522,7 +522,6 @@ struct _global_variables_t { int merge_configfile_db; - int core_dump_file_size; int stack_size; char *proxy_admin_socket; char *proxy_mysql_bind; diff --git a/lib/Makefile b/lib/Makefile index f5e496b63..5f958fd4a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -29,9 +29,6 @@ CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd MICROHTTPD_IDIR=-I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include -COREDUMPER_DIR=$(DEPS_PATH)/google-coredumper/google-coredumper -COREDUMPER_IDIR=$(COREDUMPER_DIR)/src - CURL_DIR=$(DEPS_PATH)/curl/curl CURL_IDIR=-I$(CURL_DIR)/include @@ -45,7 +42,7 @@ EV_IDIR=$(EV_DIR) IDIR=../include -IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) $(MICROHTTPD_IDIR) $(CURL_IDIR) -I$(EV_DIR) -I$(COREDUMPER_IDIR) -I$(SSL_IDIR) +IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) $(MICROHTTPD_IDIR) $(CURL_IDIR) -I$(EV_DIR) -I$(SSL_IDIR) LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index 21980ed1d..2b212df02 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -26,8 +26,6 @@ #include "platform.h" #include "microhttpd.h" -#include "google/coredumper.h" - //#define MYSQL_THREAD_IMPLEMENTATION #define SELECT_VERSION_COMMENT "select @@version_comment limit 1" @@ -980,15 +978,6 @@ bool admin_handler_command_proxysql(char *query_no_space, unsigned int query_no_ return false; } - if (query_no_space_length==strlen("PROXYSQL COREDUMP") && !strncasecmp("PROXYSQL COREDUMP",query_no_space, query_no_space_length)) { - proxy_info("Received PROXYSQL COREDUMP\n"); - proxy_info("Generating Core Dump\n"); - WriteCoreDump((const char *)"test_dump"); - ProxySQL_Admin *SPA=(ProxySQL_Admin *)pa; - SPA->send_MySQL_OK(&sess->client_myds->myprot, NULL); - return false; - } - if (query_no_space_length==strlen("PROXYSQL SHUTDOWN") && !strncasecmp("PROXYSQL SHUTDOWN",query_no_space, query_no_space_length)) { proxy_info("Received PROXYSQL SHUTDOWN command\n"); __sync_bool_compare_and_swap(&glovars.shutdown,0,1); diff --git a/src/Makefile b/src/Makefile index f68c993d1..336aee714 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,10 +40,6 @@ MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd/src MICROHTTPD_IDIR=$(MICROHTTPD_DIR)/include MICROHTTPD_LDIR=$(MICROHTTPD_DIR)/microhttpd/.libs -COREDUMPER_DIR=$(DEPS_PATH)/google-coredumper/google-coredumper -COREDUMPER_IDIR=$(COREDUMPER_DIR)/src -COREDUMPER_LDIR=$(COREDUMPER_DIR)/.libs - CURL_DIR=$(DEPS_PATH)/curl/curl CURL_IDIR=$(CURL_DIR)/include CURL_LDIR=$(CURL_DIR)/lib/.libs @@ -60,7 +56,7 @@ EV_LDIR=$(EV_DIR)/.libs IDIR=../include LDIR=../lib IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR) -I$(CLICKHOUSE_CPP_DIR) -I$(MICROHTTPD_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(SSL_IDIR) -LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(COREDUMPER_LDIR) -L$(SSL_LDIR) +LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR) UNAME_S := $(shell uname -s) @@ -81,9 +77,9 @@ MYCXXFLAGS=-std=c++11 $(IDIRS) $(OPTZ) $(DEBUG) $(PSQLCH) -DGITVERSION=\"$(GIT_V LDFLAGS+= NOJEMALLOC := $(shell echo $(NOJEMALLOC)) ifeq ($(NOJEMALLOC),1) -MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lcurl -lev -lcoredumper -Wl,-Bdynamic -lpthread -lm -lz -lrt $(EXTRALINK) +MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lcurl -lev -Wl,-Bdynamic -lpthread -lm -lz -lrt $(EXTRALINK) else -MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lcurl -lev -lcoredumper -Wl,-Bdynamic -lpthread -lm -lz -lrt $(EXTRALINK) +MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lcurl -lev -Wl,-Bdynamic -lpthread -lm -lz -lrt $(EXTRALINK) endif ifeq ($(UNAME_S),Darwin)