Mdmonitor: Improve logging method

Change logging, and as a result, mdmonitor in verbose
mode will report its configuration.

Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Oleksandr Shchirskyi <oleksandr.shchirskyi@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/Monitor.c b/Monitor.c
index 4e5802b5d30e40b8e23c17de0ffa5c0d93baf510..6ca1ebe55267e5ab2f004735f5438577d4b164ef 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -136,24 +136,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;