kore

commit 2057f4db58321785340ebdb2637cb0b11c8b1f73
parent 1ebd82969c6400e054d0927a55c92a593518383c
Author: Joris Vink <joris@coders.se>
Date:   Wed, 27 Feb 2019 19:59:31 +0100

sprinkle more kore_quiet around

Diffstat:
src/domain.c
 | 
7
+++++--
src/keymgr.c
 | 
10
++++++----

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/domain.c b/src/domain.c
@@ -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
diff --git a/src/keymgr.c b/src/keymgr.c
@@ -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);