From 85fac6df5711b418fabc87680d304e25171515f8 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Wed, 12 Jul 2017 07:49:45 -0700 Subject: Quiet down server builder --- src/cpp/server/server_builder.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index c90f96c0b7..fa3b9cf766 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -250,13 +250,6 @@ std::unique_ptr ServerBuilder::BuildAndStart() { has_sync_methods && num_frequently_polled_cqs > 0; if (has_sync_methods) { - // This is a Sync server - gpr_log(GPR_INFO, - "Synchronous server. Num CQs: %d, Min pollers: %d, Max Pollers: " - "%d, CQ timeout (msec): %d", - sync_server_settings_.num_cqs, sync_server_settings_.min_pollers, - sync_server_settings_.max_pollers, - sync_server_settings_.cq_timeout_msec); grpc_cq_polling_type polling_type = is_hybrid_server ? GRPC_CQ_NON_POLLING : GRPC_CQ_DEFAULT_POLLING; @@ -272,6 +265,16 @@ std::unique_ptr ServerBuilder::BuildAndStart() { sync_server_settings_.min_pollers, sync_server_settings_.max_pollers, sync_server_settings_.cq_timeout_msec)); + if (has_sync_methods) { + // This is a Sync server + gpr_log(GPR_INFO, + "Synchronous server. Num CQs: %d, Min pollers: %d, Max Pollers: " + "%d, CQ timeout (msec): %d", + sync_server_settings_.num_cqs, sync_server_settings_.min_pollers, + sync_server_settings_.max_pollers, + sync_server_settings_.cq_timeout_msec); + } + ServerInitializer* initializer = server->initializer(); // Register all the completion queues with the server. i.e -- cgit v1.2.3 From 79764a3bfbdec89b93b2f4a52b73e4b2ec275226 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Wed, 12 Jul 2017 07:50:09 -0700 Subject: Quiet down getenv --- src/core/lib/support/env.h | 2 ++ src/core/lib/support/env_linux.c | 35 ++++++++++++++++++++++------------- src/core/lib/support/env_posix.c | 5 +++++ src/core/lib/support/env_windows.c | 5 +++++ src/core/lib/support/log.c | 9 ++++++++- 5 files changed, 42 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/core/lib/support/env.h b/src/core/lib/support/env.h index 18bc08ac62..392fcb6e4c 100644 --- a/src/core/lib/support/env.h +++ b/src/core/lib/support/env.h @@ -36,6 +36,8 @@ char *gpr_getenv(const char *name); /* Sets the the environment with the specified name to the specified value. */ void gpr_setenv(const char *name, const char *value); +char *gpr_getenv_silent(const char *name, char** dst); + #ifdef __cplusplus } #endif diff --git a/src/core/lib/support/env_linux.c b/src/core/lib/support/env_linux.c index 0c79a2c401..bc488e1b06 100644 --- a/src/core/lib/support/env_linux.c +++ b/src/core/lib/support/env_linux.c @@ -38,8 +38,10 @@ #include "src/core/lib/support/string.h" -char *gpr_getenv(const char *name) { -#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) +char *gpr_getenv_silent(const char *name, char** dst) { + char* insecure_func_used = NULL; + char* result = NULL; + #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) typedef char *(*getenv_type)(const char *); static getenv_type getenv_func = NULL; /* Check to see which getenv variant is supported (go from most @@ -48,22 +50,29 @@ char *gpr_getenv(const char *name) { for (size_t i = 0; getenv_func == NULL && i < GPR_ARRAY_SIZE(names); i++) { getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]); if (getenv_func != NULL && strstr(names[i], "secure") == NULL) { - gpr_log(GPR_DEBUG, - "Warning: insecure environment read function '%s' used", - names[i]); + insecure_func_used = names[i]; } } - char *result = getenv_func(name); - return result == NULL ? result : gpr_strdup(result); + result = getenv_func(name); #elif __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) - char *result = secure_getenv(name); - return result == NULL ? result : gpr_strdup(result); + result = secure_getenv(name); #else - gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used", - "getenv"); - char *result = getenv(name); - return result == NULL ? result : gpr_strdup(result); + result = getenv(name); + insecure_func_used = "getenv"; #endif + *dst = result == NULL ? result : gpr_strdup(result); + return insecure_func_used; +} + +char *gpr_getenv(const char *name) { + char* result = NULL; + char* insecure_func_used = gpr_getenv_silent(name, &result); + if (insecure_func_used != NULL) { + gpr_log(GPR_DEBUG, + "Warning: insecure environment read function '%s' used", + insecure_func_used); + } + return result; } void gpr_setenv(const char *name, const char *value) { diff --git a/src/core/lib/support/env_posix.c b/src/core/lib/support/env_posix.c index bdbc4da95a..8cc802ef88 100644 --- a/src/core/lib/support/env_posix.c +++ b/src/core/lib/support/env_posix.c @@ -29,6 +29,11 @@ #include #include "src/core/lib/support/string.h" +char *gpr_getenv_silent(const char *name, char **dst) { + *dst = gpr_getenv(name); + return NULL; +} + char *gpr_getenv(const char *name) { char *result = getenv(name); return result == NULL ? result : gpr_strdup(result); diff --git a/src/core/lib/support/env_windows.c b/src/core/lib/support/env_windows.c index c1d557e219..557d5d6ad5 100644 --- a/src/core/lib/support/env_windows.c +++ b/src/core/lib/support/env_windows.c @@ -30,6 +30,11 @@ #include #include +char *gpr_getenv_silent(const char *name, char **dst) { + *dst = gpr_getenv(name); + return NULL; +} + char *gpr_getenv(const char *name) { char *result = NULL; DWORD size; diff --git a/src/core/lib/support/log.c b/src/core/lib/support/log.c index bcc336b8ae..010dc65d6a 100644 --- a/src/core/lib/support/log.c +++ b/src/core/lib/support/log.c @@ -64,7 +64,8 @@ void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print) { } void gpr_log_verbosity_init() { - char *verbosity = gpr_getenv("GRPC_VERBOSITY"); + char *verbosity = NULL; + char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity); gpr_atm min_severity_to_print = GPR_LOG_SEVERITY_ERROR; if (verbosity != NULL) { @@ -81,6 +82,12 @@ void gpr_log_verbosity_init() { GPR_LOG_VERBOSITY_UNSET) { gpr_atm_no_barrier_store(&g_min_severity_to_print, min_severity_to_print); } + + if (insecure_getenv != NULL) { + gpr_log(GPR_DEBUG, + "Warning: insecure environment read function '%s' used", + insecure_getenv); + } } void gpr_set_log_function(gpr_log_func f) { -- cgit v1.2.3 From 68d78c6330664019abaefa6e762caf50b93c989d Mon Sep 17 00:00:00 2001 From: ncteisen Date: Thu, 13 Jul 2017 07:25:40 -0700 Subject: Add comment --- src/core/lib/support/env.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/core/lib/support/env.h b/src/core/lib/support/env.h index 392fcb6e4c..e1c3bdc66a 100644 --- a/src/core/lib/support/env.h +++ b/src/core/lib/support/env.h @@ -36,6 +36,10 @@ char *gpr_getenv(const char *name); /* Sets the the environment with the specified name to the specified value. */ void gpr_setenv(const char *name, const char *value); +/* This is a version of gpr_getenv that does not produce any output if it has to + use an insecure version of the function. It is ONLY to be used to solve the + problem in which we need to check an env variable to configure the verbosity + level of logging. So DO NOT USE THIS. */ char *gpr_getenv_silent(const char *name, char** dst); #ifdef __cplusplus -- cgit v1.2.3 From 139072ff929891ada8f98f1890d63b45ce049c64 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Thu, 13 Jul 2017 23:47:59 -0700 Subject: Const correct and clang --- src/core/lib/support/env.h | 2 +- src/core/lib/support/env_linux.c | 15 +++++++-------- src/core/lib/support/env_posix.c | 2 +- src/core/lib/support/env_windows.c | 2 +- src/core/lib/support/log.c | 5 ++--- src/cpp/server/server_builder.cc | 1 - 6 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/core/lib/support/env.h b/src/core/lib/support/env.h index e1c3bdc66a..e2c012a728 100644 --- a/src/core/lib/support/env.h +++ b/src/core/lib/support/env.h @@ -40,7 +40,7 @@ void gpr_setenv(const char *name, const char *value); use an insecure version of the function. It is ONLY to be used to solve the problem in which we need to check an env variable to configure the verbosity level of logging. So DO NOT USE THIS. */ -char *gpr_getenv_silent(const char *name, char** dst); +const char *gpr_getenv_silent(const char *name, char **dst); #ifdef __cplusplus } diff --git a/src/core/lib/support/env_linux.c b/src/core/lib/support/env_linux.c index bc488e1b06..4c45a977ca 100644 --- a/src/core/lib/support/env_linux.c +++ b/src/core/lib/support/env_linux.c @@ -38,10 +38,10 @@ #include "src/core/lib/support/string.h" -char *gpr_getenv_silent(const char *name, char** dst) { - char* insecure_func_used = NULL; - char* result = NULL; - #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) +const char *gpr_getenv_silent(const char *name, char **dst) { + const char *insecure_func_used = NULL; + char *result = NULL; +#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) typedef char *(*getenv_type)(const char *); static getenv_type getenv_func = NULL; /* Check to see which getenv variant is supported (go from most @@ -65,11 +65,10 @@ char *gpr_getenv_silent(const char *name, char** dst) { } char *gpr_getenv(const char *name) { - char* result = NULL; - char* insecure_func_used = gpr_getenv_silent(name, &result); + char *result = NULL; + const char *insecure_func_used = gpr_getenv_silent(name, &result); if (insecure_func_used != NULL) { - gpr_log(GPR_DEBUG, - "Warning: insecure environment read function '%s' used", + gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used", insecure_func_used); } return result; diff --git a/src/core/lib/support/env_posix.c b/src/core/lib/support/env_posix.c index 8cc802ef88..b88822ca02 100644 --- a/src/core/lib/support/env_posix.c +++ b/src/core/lib/support/env_posix.c @@ -29,7 +29,7 @@ #include #include "src/core/lib/support/string.h" -char *gpr_getenv_silent(const char *name, char **dst) { +const char *gpr_getenv_silent(const char *name, char **dst) { *dst = gpr_getenv(name); return NULL; } diff --git a/src/core/lib/support/env_windows.c b/src/core/lib/support/env_windows.c index 557d5d6ad5..652eeb61c6 100644 --- a/src/core/lib/support/env_windows.c +++ b/src/core/lib/support/env_windows.c @@ -30,7 +30,7 @@ #include #include -char *gpr_getenv_silent(const char *name, char **dst) { +const char *gpr_getenv_silent(const char *name, char **dst) { *dst = gpr_getenv(name); return NULL; } diff --git a/src/core/lib/support/log.c b/src/core/lib/support/log.c index 010dc65d6a..fadb4d9a2c 100644 --- a/src/core/lib/support/log.c +++ b/src/core/lib/support/log.c @@ -65,7 +65,7 @@ void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print) { void gpr_log_verbosity_init() { char *verbosity = NULL; - char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity); + const char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity); gpr_atm min_severity_to_print = GPR_LOG_SEVERITY_ERROR; if (verbosity != NULL) { @@ -84,8 +84,7 @@ void gpr_log_verbosity_init() { } if (insecure_getenv != NULL) { - gpr_log(GPR_DEBUG, - "Warning: insecure environment read function '%s' used", + gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used", insecure_getenv); } } diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index fa3b9cf766..200e477822 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -250,7 +250,6 @@ std::unique_ptr ServerBuilder::BuildAndStart() { has_sync_methods && num_frequently_polled_cqs > 0; if (has_sync_methods) { - grpc_cq_polling_type polling_type = is_hybrid_server ? GRPC_CQ_NON_POLLING : GRPC_CQ_DEFAULT_POLLING; -- cgit v1.2.3