From 73fcf102508b811a4b2deddc06282f47d499bfd0 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 20 Jul 2018 01:02:18 -0400
Subject: [PATCH] Handle restarts nicer; fix bug in failedreason write

---
 pvcd/VMInstance.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pvcd/VMInstance.py b/pvcd/VMInstance.py
index 5013c99c..9b478f83 100644
--- a/pvcd/VMInstance.py
+++ b/pvcd/VMInstance.py
@@ -126,7 +126,7 @@ class VMInstance:
         except libvirt.libvirtError as e:
             ansiiprint.echo('Failed to create VM', '{}:'.format(self.domuuid), 'e')
             zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(self.domuuid): 'failed' })
-            zkhandler.writedata(self.zk_conn, { '/domains/{}/failedreason'.format(self.domuuid): e })
+            zkhandler.writedata(self.zk_conn, { '/domains/{}/failedreason'.format(self.domuuid): str(e) })
             self.dom = None
 
         lv_conn.close()
@@ -145,13 +145,9 @@ class VMInstance:
             self.inrestart = False
             return
     
-        try:
-            self.shutdown_vm()
-            self.start_vm()
-            self.addDomainToList()
-            ansiiprint.echo('Successfully restarted VM', '{}:'.format(self.domuuid), 'o')
-        except libvirt.libvirtError as e:
-            ansiiprint.echo('Failed to restart VM', '{}:'.format(self.domuuid), 'e')
+        self.shutdown_vm()
+        self.start_vm()
+        self.addDomainToList()
 
         zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(self.domuuid): 'start' })
         lv_conn.close()