From patchwork Sat Aug 3 08:57:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 264396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id E5F132C008A for ; Sat, 3 Aug 2013 18:57:48 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V5Xel-0000GV-EG; Sat, 03 Aug 2013 08:57:47 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V5Xef-0000GQ-SM for fwts-devel@lists.ubuntu.com; Sat, 03 Aug 2013 08:57:41 +0000 Received: from faun.canonical.com ([91.189.93.182] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1V5Xef-0004ty-R6 for fwts-devel@lists.ubuntu.com; Sat, 03 Aug 2013 08:57:41 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH][RESEND] lib: fwts_log_json: enable json human readable formatting (LP: #1206290) Date: Sat, 3 Aug 2013 09:57:41 +0100 Message-Id: <1375520261-22114-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King The current json log output is hard to read as a human. Enable the json pretty printing (if libjson supports it) to make it easier for mortals to parse by eye. Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/lib/src/fwts_log_json.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/src/fwts_log_json.c b/src/lib/src/fwts_log_json.c index a67bc3a..4ce1dfe 100644 --- a/src/lib/src/fwts_log_json.c +++ b/src/lib/src/fwts_log_json.c @@ -216,7 +216,12 @@ static void fwts_log_close_json(fwts_log_file *log_file) fwts_log_section_end_json(log_file); +#ifdef JSON_C_TO_STRING_PRETTY + str = json_object_to_json_string_ext( + json_stack[0].obj, JSON_C_TO_STRING_PRETTY); +#else str = json_object_to_json_string(json_stack[0].obj); +#endif if (str == NULL) { /* Let's not make this bail out as user may be logging to other files too */ fprintf(stderr, "Cannot turn json object to text for output. Empty json output\n");