From patchwork Tue Aug 7 13:17:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: QI Fuli X-Patchwork-Id: 10558715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C207813AC for ; Tue, 7 Aug 2018 13:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9FA229D86 for ; Tue, 7 Aug 2018 13:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92C5229DBB; Tue, 7 Aug 2018 13:18:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5152F29D86 for ; Tue, 7 Aug 2018 13:18:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 499D2210DF4F0; Tue, 7 Aug 2018 06:18:13 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=202.219.69.169; helo=mgwkm02.jp.fujitsu.com; envelope-from=qi.fuli@jp.fujitsu.com; receiver=linux-nvdimm@lists.01.org Received: from mgwkm02.jp.fujitsu.com (mgwkm02.jp.fujitsu.com [202.219.69.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2C103210DC1DB for ; Tue, 7 Aug 2018 06:18:11 -0700 (PDT) Received: from kw-mxoi2.gw.nic.fujitsu.com (unknown [192.168.231.133]) by mgwkm02.jp.fujitsu.com with smtp id 5051_3d7e_a22d9759_9a2c_4562_a453_5ea6a3a227e3; Tue, 07 Aug 2018 22:18:06 +0900 Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by kw-mxoi2.gw.nic.fujitsu.com (Postfix) with ESMTP id E87DEAC00FD for ; Tue, 7 Aug 2018 22:18:05 +0900 (JST) Received: from localhost.localdomain (unknown [10.124.196.110]) by m3051.s.css.fujitsu.com (Postfix) with ESMTP id C153C166; Tue, 7 Aug 2018 22:18:05 +0900 (JST) From: QI Fuli To: linux-nvdimm@lists.01.org Subject: [ndctl PATCH 3/4] ndctl, monitor: add timestamp and pid to log messages in log_file() Date: Tue, 7 Aug 2018 22:17:55 +0900 Message-Id: <20180807131756.23673-4-qi.fuli@jp.fujitsu.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180807131756.23673-1-qi.fuli@jp.fujitsu.com> References: <20180807131756.23673-1-qi.fuli@jp.fujitsu.com> X-TM-AS-MML: disable X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP This patch is used to add timestamp and process id to log messages when logging messages to a file. Signed-off-by: QI Fuli --- ndctl/monitor.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 2f3d751..d29e378 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -84,6 +84,8 @@ static void log_file(struct ndctl_ctx *ctx, int priority, const char *file, { FILE *f; char *buf; + struct timespec ts; + char timestamp[32]; if (vasprintf(&buf, format, args) < 0) { fail("vasprintf error\n"); @@ -99,7 +101,14 @@ static void log_file(struct ndctl_ctx *ctx, int priority, const char *file, notice(ctx, "%s\n", buf); goto end; } - fprintf(f, "%s", buf); + + if (priority != LOG_NOTICE) { + clock_gettime(CLOCK_REALTIME, &ts); + sprintf(timestamp, "%10ld.%09ld", ts.tv_sec, ts.tv_nsec); + fprintf(f, "[%s] [%d] %s", timestamp, getpid(), buf); + } else + fprintf(f, "%s", buf); + fflush(f); fclose(f); end: