[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: zabbix-front-end: Improve hint and error messages.
From: |
guix-commits |
Subject: |
01/01: services: zabbix-front-end: Improve hint and error messages. |
Date: |
Wed, 19 Dec 2018 13:15:26 -0500 (EST) |
wigust pushed a commit to branch master
in repository guix.
commit 0485717ee94e7f161d072f017edce5d35df49c81
Author: Oleg Pykhalov <address@hidden>
Date: Wed Dec 19 20:47:15 2018 +0300
services: zabbix-front-end: Improve hint and error messages.
* gnu/services/monitoring.scm (zabbix-front-end-config): Improve hint and
error messages.
---
gnu/services/monitoring.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm
index 1841309..4c7a717 100644
--- a/gnu/services/monitoring.scm
+++ b/gnu/services/monitoring.scm
@@ -29,9 +29,11 @@
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix records)
+ #:use-module ((guix ui) #:select (display-hint))
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-35)
#:export (darkstat-configuration
prometheus-node-exporter-configuration
darkstat-service-type
@@ -525,16 +527,16 @@ $DB['DATABASE'] = '" db-name "';
$DB['USER'] = '" db-user "';
$DB['PASSWORD'] = '" (if (string-null? db-password)
(if (string-null? db-secret-file)
- (display "Provide a `db-secret-file' \
-or `db-password' field.
-"
- (current-error-port))
+ (raise (condition
+ (&message
+ (message "\
+You must provide either 'db-secret-file' or 'db-password'."))))
(string-trim-both
(with-input-from-file db-secret-file
read-string)))
(begin
- (display "
-Hint: Consider use `db-secret-file' instead of `db-password' and unset
+ (display-hint "
+Consider use `db-secret-file' instead of `db-password' and unset
`db-password' for security in `zabbix-front-end-configuration'.
")
db-password)) "';