From 636b1ebd382a57b623c7c8e5b010d6fc626a20d3 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 26 Jun 2015 09:10:13 -0700 Subject: [PATCH] init: Fix logging stutter - Get rid of log stutter, tag (executable basename) is added by the logging routines Bug: 17914575 Change-Id: If00eb1b915065fb52c9311648b7ada4c9e2696bd --- init/watchdogd.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/init/watchdogd.cpp b/init/watchdogd.cpp index 881a4dfb5..0d16db907 100644 --- a/init/watchdogd.cpp +++ b/init/watchdogd.cpp @@ -38,29 +38,30 @@ int watchdogd_main(int argc, char **argv) { int margin = 10; if (argc >= 3) margin = atoi(argv[2]); - NOTICE("watchdogd started (interval %d, margin %d)!\n", interval, margin); + NOTICE("started (interval %d, margin %d)!\n", interval, margin); int fd = open(DEV_NAME, O_RDWR|O_CLOEXEC); if (fd == -1) { - ERROR("watchdogd: Failed to open %s: %s\n", DEV_NAME, strerror(errno)); + ERROR("Failed to open %s: %s\n", DEV_NAME, strerror(errno)); return 1; } int timeout = interval + margin; int ret = ioctl(fd, WDIOC_SETTIMEOUT, &timeout); if (ret) { - ERROR("watchdogd: Failed to set timeout to %d: %s\n", timeout, strerror(errno)); + ERROR("Failed to set timeout to %d: %s\n", timeout, strerror(errno)); ret = ioctl(fd, WDIOC_GETTIMEOUT, &timeout); if (ret) { - ERROR("watchdogd: Failed to get timeout: %s\n", strerror(errno)); + ERROR("Failed to get timeout: %s\n", strerror(errno)); } else { if (timeout > margin) { interval = timeout - margin; } else { interval = 1; } - ERROR("watchdogd: Adjusted interval to timeout returned by driver: timeout %d, interval %d, margin %d\n", - timeout, interval, margin); + WARNING("Adjusted interval to timeout returned by driver:" + " timeout %d, interval %d, margin %d\n", + timeout, interval, margin); } }