Add fail callback to monitors

cockpit-project · Sep 12, 2019 · a9e8871 · a9e8871
1 parent 33f2a7e
commit a9e8871
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/ContainerCommitModal.jsx b/src/ContainerCommitModal.jsx
@@ -97,7 +97,7 @@ class ContainerCommitModal extends React.Component {
 
             if (reply && 'logs' in reply && Array.isArray(reply.logs) && reply.logs.length > 0)
                 console.log("Container commit:", message.parameters.reply.logs.join("\n"));
-        }, this.props.container.isRoot)
+        }, this.props.onHide, this.props.container.isRoot)
                 .then(() => this.props.onHide())
                 .catch(ex => {
                     this.setState({

diff --git a/src/app.jsx b/src/app.jsx
@@ -291,6 +291,9 @@ class Application extends React.Component {
                     utils.monitor("GetEvents", {},
                                   message => {
                                       message.parameters && message.parameters.events && this.handleEvent(message.parameters.events, root);
+                                  }, isRoot => {
+                                      this.setState({ [isRoot ? "rootServiceAvailable" : "userServiceAvailable"]: false
+                                      });
                                   },
                                   root
                     );

diff --git a/src/util.js b/src/util.js
@@ -69,12 +69,18 @@ export function podmanAction(name, args, root) {
     return varlink.call(address, "io.podman." + name, args, root);
 }
 
-export function monitor(name, args, callback, root) {
+export function monitor(name, args, callback, error_callback, root) {
     let address = PODMAN_ROOT_ADDRESS;
     if (!root)
         address = PODMAN_USER_ADDRESS;
     return varlink.connect(address, root)
-            .then(connection => { return connection.monitor("io.podman." + name, args, callback) });
+            .then(connection => { return connection.monitor("io.podman." + name, args, callback) })
+            .catch(e => {
+                if (e.name === "ConnectionClosed")
+                    error_callback(root);
+                else
+                    console.log(e);
+            });
 }
 
 export function updateImage(id, root) {