services: make reload safer and default to it in gui

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs
index 8ecb6dc123eea3735bf8c4fdcf4606b2c85c74cc..923252cd5303b0218b4161d5315192e824bfc776 100644 (file)
--- a/src/api2/node/services.rs
+++ b/src/api2/node/services.rs
@@ -185,10 +185,11 @@ fn run_service_command(service: &str, cmd: &str) -> Result<Value, Error> {
 
     // fixme: run background worker (fork_worker) ???
 
-    match cmd {
-        "start"|"stop"|"restart"|"reload" => {},
+    let cmd = match cmd {
+        "start"|"stop"|"restart"=> cmd,
+        "reload" => "try-reload-or-restart", // some services do not implement reload
         _ => bail!("unknown service command '{}'", cmd),
-    }
+    };
 
     if service == "proxmox-backup" && cmd == "stop" {
         bail!("invalid service cmd '{} {}' cannot stop essential service!", service, cmd);

diff --git a/www/ServerAdministration.js b/www/ServerAdministration.js
index edbc0ee353ce3d2d19a8dfd9ae15c38a987c89b9..076d554321c5a610f85352ced42bedd3569e4756 100644 (file)
--- a/www/ServerAdministration.js
+++ b/www/ServerAdministration.js
@@ -26,6 +26,7 @@ Ext.define('PBS.ServerAdministration', {
            xtype: 'proxmoxNodeServiceView',
             title: gettext('Services'),
            itemId: 'services',
+           restartCommand: 'reload', // avoid disruptions
            startOnlyServices: {
                syslog: true,
                'proxmox-backup': true,