From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D495C65DA2 for ; Fri, 24 Jul 2020 15:25:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1DF5B308 for ; Fri, 24 Jul 2020 15:25:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6BEA1B2F5 for ; Fri, 24 Jul 2020 15:25:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 314A143351 for ; Fri, 24 Jul 2020 15:25:34 +0200 (CEST) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Date: Fri, 24 Jul 2020 15:25:26 +0200 Message-Id: <20200724132527.3623835-2-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724132527.3623835-1-t.lamprecht@proxmox.com> References: <20200724132527.3623835-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [services.pm] Subject: [pve-devel] applied: [PATCH manager 2/3] api/services: fallback to restart in reload X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2020 13:25:35 -0000 And document that it is preferred Signed-off-by: Thomas Lamprecht --- PVE/API2/Services.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Services.pm b/PVE/API2/Services.pm index e5b3c3da..df9606f4 100644 --- a/PVE/API2/Services.pm +++ b/PVE/API2/Services.pm @@ -319,7 +319,7 @@ __PACKAGE__->register_method ({ name => 'service_restart', path => '{service}/restart', method => 'POST', - description => "Restart service.", + description => "Hard restart service. Use reload if you want to reduce interruptions.", permissions => { check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]], }, @@ -355,7 +355,7 @@ __PACKAGE__->register_method ({ name => 'service_reload', path => '{service}/reload', method => 'POST', - description => "Reload service.", + description => "Reload service. Falls back to restart if service cannot be reloaded.", permissions => { check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]], }, @@ -381,7 +381,7 @@ __PACKAGE__->register_method ({ my $upid = shift; syslog('info', "reloading service $param->{service}: $upid\n"); - $service_cmd->($param->{service}, 'reload'); + $service_cmd->($param->{service}, 'try-reload-or-restart'); }; -- 2.20.1