From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@redhat.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, djwong@kernel.org
Subject: [PATCH 03/16] xfs_scrub: log operational messages when interactive
Date: Thu, 01 Mar 2018 11:13:14 -0800 [thread overview]
Message-ID: <151993159412.22223.9791048469399407816.stgit@magnolia> (raw)
In-Reply-To: <151993157539.22223.6269629008244777191.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Record the output of an interactive session in the system log so that
future support requests can get a better picture of what happened.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
scrub/common.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/scrub/common.c b/scrub/common.c
index 17c3699..672f286 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -21,6 +21,7 @@
#include <pthread.h>
#include <stdbool.h>
#include <sys/statvfs.h>
+#include <syslog.h>
#include "platform_defs.h"
#include "xfs.h"
#include "xfs_fs.h"
@@ -29,6 +30,8 @@
#include "common.h"
#include "progress.h"
+extern char *progname;
+
/*
* Reporting Status to the Console
*
@@ -64,6 +67,12 @@ static const char *err_str[] = {
[S_PREEN] = "Optimized",
};
+static int log_level[] = {
+ [S_ERROR] = LOG_ERR,
+ [S_WARN] = LOG_WARNING,
+ [S_INFO] = LOG_INFO,
+};
+
/* If stream is a tty, clear to end of line to clean up progress bar. */
static inline const char *stream_start(FILE *stream)
{
@@ -73,6 +82,8 @@ static inline const char *stream_start(FILE *stream)
}
/* Print a warning string and some warning text. */
+#define LOG_BUFSZ 4096
+#define LOGNAME_BUFSZ 256
void
__str_out(
struct scrub_ctx *ctx,
@@ -110,6 +121,32 @@ __str_out(
va_end(args);
}
+ /* If we're running interactively, log the message to syslog too. */
+ if (isatty(fileno(stdin)) && !debug) {
+ char logname[LOGNAME_BUFSZ];
+
+ snprintf(logname, LOGNAME_BUFSZ, "%s@%s", progname,
+ ctx->mntpoint);
+ openlog(logname, LOG_PID, LOG_DAEMON);
+
+ if (error) {
+ syslog(LOG_ERR, "%s: %s: %s.",
+ _(err_str[level]), descr,
+ strerror_r(error, buf, DESCR_BUFSZ));
+ } else {
+ char buf[LOG_BUFSZ];
+ int sz;
+
+ sz = snprintf(buf, LOG_BUFSZ, "%s: %s: ",
+ _(err_str[level]), descr);
+ va_start(args, format);
+ vsnprintf(buf + sz, LOG_BUFSZ - sz, format, args);
+ va_end(args);
+ syslog(log_level[level], "%s", buf);
+ }
+ closelog();
+ }
+
if (debug)
fprintf(stream, _(" (%s line %d)"), file, line);
fprintf(stream, "\n");
next prev parent reply other threads:[~2018-03-01 19:13 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 19:12 [PATCH 00/16] xfsprogs: misc fixes, geometry refactoring Darrick J. Wong
2018-03-01 19:13 ` [PATCH 01/16] misc: fix gcc 7.3 warnings Darrick J. Wong
2018-03-02 22:11 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 02/16] xfs_db: don't crash in ablock if there's no inode Darrick J. Wong
2018-03-01 19:13 ` Darrick J. Wong [this message]
2018-03-08 19:35 ` [PATCH v2 03/16] xfs_scrub: log operational messages when interactive Darrick J. Wong
2018-03-08 19:52 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 04/16] xfs_scrub: don't ask user to run xfs_repair for only warnings Darrick J. Wong
2018-03-06 17:16 ` Eric Sandeen
2018-03-06 17:27 ` Darrick J. Wong
2018-03-06 18:34 ` Eric Sandeen
2018-03-06 18:53 ` Darrick J. Wong
2018-03-06 19:00 ` Eric Sandeen
2018-03-06 23:24 ` Darrick J. Wong
2018-03-08 19:36 ` [PATCH v2 " Darrick J. Wong
2018-03-08 20:20 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 05/16] xfs_scrub: fix #include ordering to avoid build failure Darrick J. Wong
2018-03-06 17:19 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 06/16] xfs_scrub: don't try to scan xattrs if bstat says there aren't any Darrick J. Wong
2018-03-06 17:19 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 07/16] xfs_db: print transaction reservation type information Darrick J. Wong
2018-03-06 19:16 ` Eric Sandeen
2018-03-01 19:13 ` [PATCH 08/16] xfs_repair: don't fail directory repairs when grabbing inodes Darrick J. Wong
2018-03-06 19:23 ` Eric Sandeen
2018-03-06 19:43 ` Darrick J. Wong
2018-03-06 20:55 ` Darrick J. Wong
2018-03-01 19:14 ` [PATCH 09/16] misc: enable link time optimization, if requested Darrick J. Wong
2018-03-07 3:00 ` Eric Sandeen
2018-03-01 19:14 ` [PATCH 10/16] libfrog: refactor fs geometry printing function Darrick J. Wong
2018-03-01 19:14 ` [PATCH 11/16] mkfs: use geometry generation / helper functions Darrick J. Wong
2018-03-01 19:14 ` [PATCH 12/16] xfs_db: add a superblock info command Darrick J. Wong
2018-03-06 19:32 ` Eric Sandeen
2018-03-06 19:34 ` Eric Sandeen
2018-03-06 20:49 ` Darrick J. Wong
2018-03-08 4:14 ` Dave Chinner
2018-03-01 19:14 ` [PATCH 13/16] xfs_spaceman: " Darrick J. Wong
2018-03-01 19:14 ` [PATCH 14/16] xfs_info: move to xfs_spaceman Darrick J. Wong
2018-03-07 3:50 ` Eric Sandeen
2018-03-07 20:33 ` Darrick J. Wong
2018-03-08 4:17 ` Dave Chinner
2018-03-01 19:14 ` [PATCH 15/16] xfs_info: call xfs_db for offline filesystems Darrick J. Wong
2018-03-01 19:14 ` [PATCH 16/16] xfs_growfs: refactor geometry reporting Darrick J. Wong
2018-03-07 18:34 ` [RFC PATCH 17/16] xfs_spaceman: only produce info for root of mounted xfs Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=151993159412.22223.9791048469399407816.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).