Re: [PATCH v2 2/2] Mdmonitor: Improve logging method

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4/5/22 7:40 PM, Kinga Tanska wrote:
Change logging, and as a result, mdmonitor in verbose
mode will report its configuration.

Signed-off-by: Kinga Tanska <kinga.tanska@xxxxxxxxx>
Signed-off-by: Oleksandr Shchirskyi <oleksandr.shchirskyi@xxxxxxxxx>


Acked-by: Coly Li <colyli@xxxxxxx>


Thanks.


Coly Li


---
  Monitor.c | 25 ++++++++++++++-----------
  1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Monitor.c b/Monitor.c
index 0b24b656..bd417d04 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -137,24 +137,27 @@ int Monitor(struct mddev_dev *devlist,
  	struct mddev_ident *mdlist;
  	int delay_for_event = c->delay;
- if (!mailaddr) {
+	if (!mailaddr)
  		mailaddr = conf_get_mailaddr();
-		if (mailaddr && ! c->scan)
-			pr_err("Monitor using email address \"%s\" from config file\n",
-			       mailaddr);
-	}
-	mailfrom = conf_get_mailfrom();
- if (!alert_cmd) {
+	if (!alert_cmd)
  		alert_cmd = conf_get_program();
-		if (alert_cmd && !c->scan)
-			pr_err("Monitor using program \"%s\" from config file\n",
-			       alert_cmd);
-	}
+
+	mailfrom = conf_get_mailfrom();
+
  	if (c->scan && !mailaddr && !alert_cmd && !dosyslog) {
  		pr_err("No mail address or alert command - not monitoring.\n");
  		return 1;
  	}
+
+	if (c->verbose) {
+		pr_err("Monitor is started with delay %ds\n", c->delay);
+		if (mailaddr)
+			pr_err("Monitor using email address %s\n", mailaddr);
+		if (alert_cmd)
+			pr_err("Monitor using program %s\n", alert_cmd);
+	}
+
  	info.alert_cmd = alert_cmd;
  	info.mailaddr = mailaddr;
  	info.mailfrom = mailfrom;





[Index of Archives]     [Linux RAID Wiki]     [ATA RAID]     [Linux SCSI Target Infrastructure]     [Linux Block]     [Linux IDE]     [Linux SCSI]     [Linux Hams]     [Device Mapper]     [Device Mapper Cryptographics]     [Kernel]     [Linux Admin]     [Linux Net]     [GFS]     [RPM]     [git]     [Yosemite Forum]


  Powered by Linux