From patchwork Sun Jun 14 04:14:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 483920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 442F11400A0 for ; Sun, 14 Jun 2015 14:28:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=DKH8bkhV; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D95D228C0EB; Sun, 14 Jun 2015 06:27:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D422228BD84 for ; Sun, 14 Jun 2015 06:26:59 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-pa0-f43.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 14 Jun 2015 06:26:57 +0200 (CEST) Received: by padev16 with SMTP id ev16so44820776pad.0 for ; Sat, 13 Jun 2015 21:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yAsDlnOKSFVqmj4qX2D+6PX6CNCyzxGjSMXglItIpzo=; b=DKH8bkhVgg/wtvgUpwGh/v6I0A/mdOMGg16DKOfzfPVb5Nt6AGFJK1p3GoZJZ0RouZ wmXXrbIqciDahKtP4+exKlCL5LHb1eDlrjkkuNHAEjb6ozn+9sIeOgMZ7VQ/jMSSkdLS gX6v8EUz5ps/9h7AsljdmWtckm55r2qak0HUpnydfwIfTUpXbtfJ/ltjvkuO28VlygNc 4gcuRtfXDQEiY9FS19dwERn3u7jgM6PKbsDGIiEo6RumjRyWZex0uOOoOXv9IyNOKIBb 4jyNyUZzDnOmAGfe3ojvKp8GoqtErmGdKDFn2LcRZUWQr9+/yqFs4EXqGiR1IBrykDXQ tKig== X-Received: by 10.68.69.15 with SMTP id a15mr12291156pbu.106.1434256017084; Sat, 13 Jun 2015 21:26:57 -0700 (PDT) Received: from debian.corp.sankuai.com ([103.29.140.57]) by mx.google.com with ESMTPSA id w4sm8120056pdl.7.2015.06.13.21.26.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2015 21:26:56 -0700 (PDT) From: Yousong Zhou To: blogic@openwrt.org Date: Sun, 14 Jun 2015 12:14:44 +0800 Message-Id: <1434255287-18591-3-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434255287-18591-1-git-send-email-yszhou4tech@gmail.com> References: <1434255287-18591-1-git-send-email-yszhou4tech@gmail.com> Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH 2/5] service: dump respawn params in the same order as when passed in. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Yousong Zhou --- service/instance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/instance.c b/service/instance.c index 4ace40b..e89cbc6 100644 --- a/service/instance.c +++ b/service/instance.c @@ -917,8 +917,8 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) if (in->respawn) { void *r = blobmsg_open_table(b, "respawn"); - blobmsg_add_u32(b, "timeout", in->respawn_timeout); blobmsg_add_u32(b, "threshold", in->respawn_threshold); + blobmsg_add_u32(b, "timeout", in->respawn_timeout); blobmsg_add_u32(b, "retry", in->respawn_retry); blobmsg_close_table(b, r); }