From patchwork Mon Jun 6 10:17:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinga Tanska X-Patchwork-Id: 12870222 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0A4EC433EF for ; Mon, 6 Jun 2022 10:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233896AbiFFKOa (ORCPT ); Mon, 6 Jun 2022 06:14:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233625AbiFFKOT (ORCPT ); Mon, 6 Jun 2022 06:14:19 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE93E17EC26 for ; Mon, 6 Jun 2022 03:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654510292; x=1686046292; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PsLUrbqrDVYQGJtVj9RMKcbkPUxy7PWFJwYRsIK3yK8=; b=UDsUGwwfuPxloggUskXNzZKLp+KZTL1q0jrITC03TzXmX5tgf2xi8Xfx JJ9Z08CTVYxO2dI+hZtT+x7IjuhulDrFhksNi99FwQHz9XGIP4Wgg+nMz K3lia23+7aZtQ+lXb/qz01z1YBREWEyF6h2rCzsn9LDeNVlaaxzsY1T1c lS2UlFgf+XO06eEihBMDa8buuMIrKePYUiFjbql1ajmHM2ZG8pbCyJkGb ppN0ua0C+2l/LzdKf2d2sZW9Qkvuih3AKzpkUYNR0WMZfTrjGEr7GZ5Fj 8xPyGG3o5Kb/oKaaQbupWe+SJn1Ei5AQYW4KyYM2Lt+j5bhRlKRSA3N67 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10369"; a="274180201" X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="274180201" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2022 03:11:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="682189062" Received: from unknown (HELO localhost.igk.intel.com) ([10.102.102.97]) by fmsmga002.fm.intel.com with ESMTP; 06 Jun 2022 03:11:31 -0700 From: Kinga Tanska To: linux-raid@vger.kernel.org Cc: jes@trained-monkey.org, colyli@suse.de, pmenzel@molgen.mpg.de Subject: [PATCH v3 2/2] Mdmonitor: Improve logging method Date: Mon, 6 Jun 2022 12:17:15 +0200 Message-Id: <20220606101715.11433-3-kinga.tanska@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220606101715.11433-1-kinga.tanska@intel.com> References: <20220606101715.11433-1-kinga.tanska@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org Change logging, and as a result, mdmonitor in verbose mode will report its configuration. Signed-off-by: Kinga Tanska Signed-off-by: Oleksandr Shchirskyi --- 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;