sprinkle more kore_quiet around

This commit is contained in:
Joris Vink 2019-02-27 19:59:31 +01:00
parent 1ebd82969c
commit 2057f4db58
2 changed files with 11 additions and 6 deletions

View File

@ -156,8 +156,11 @@ kore_domain_init(void)
#endif
#if !defined(TLS1_3_VERSION)
kore_log(LOG_NOTICE, "%s has no TLS 1.3 - will only use TLS 1.2",
OPENSSL_VERSION_TEXT);
if (!kore_quiet) {
kore_log(LOG_NOTICE,
"%s has no TLS 1.3 - will only use TLS 1.2",
OPENSSL_VERSION_TEXT);
}
#endif
#endif

View File

@ -106,7 +106,7 @@ kore_keymgr_run(void)
if (rand_file != NULL) {
keymgr_load_randfile();
keymgr_save_randfile();
} else {
} else if (!kore_quiet) {
kore_log(LOG_WARNING, "no rand_file location specified");
}
@ -121,7 +121,8 @@ kore_keymgr_run(void)
fatal("failed to pledge keymgr process");
#endif
kore_log(LOG_NOTICE, "key manager started");
if (!kore_quiet)
kore_log(LOG_NOTICE, "key manager started");
while (quit != 1) {
now = kore_time_ms();
@ -161,7 +162,7 @@ kore_keymgr_cleanup(int final)
{
struct key *key, *next;
if (final)
if (final && !kore_quiet)
kore_log(LOG_NOTICE, "cleaning up keys");
if (initialized == 0)
@ -181,7 +182,8 @@ keymgr_reload(void)
{
struct kore_domain *dom;
kore_log(LOG_INFO, "(re)loading certificates, keys and CRLs");
if (!kore_quiet)
kore_log(LOG_INFO, "(re)loading certificates, keys and CRLs");
kore_keymgr_cleanup(0);
TAILQ_INIT(&keys);