We now use the logging module

[nitsi.git] / machine.py

diff --git a/machine.py b/machine.py
index 035c010a608a3b4a6e2cdb0bb2082b42eba566b0..867a8a01f791bbbc5bdff5b8285239fc6e041d68 100644 (file)
--- a/machine.py
+++ b/machine.py
@@ -6,16 +6,17 @@ from disk import disk
 
 from serial_connection import serial_connection
 
-from test import libvirt_con
-
 import os
 import libvirt
 
+import logging
+
+logger = logging.getLogger("nitsi.machine")
 
 class machine():
-    def __init__(self, vm_xml_file, snapshot_xml_file, image, root_uid, username, password):
-        self.log = log(4)
-        self.con = libvirt_con("qemu:///system")
+    def __init__(self, libvirt_con, vm_xml_file, snapshot_xml_file, image, root_uid, username, password):
+        self.log = logger.getChild(os.path.basename(vm_xml_file))
+        self.con = libvirt_con
         try:
             with open(vm_xml_file) as fobj:
                 self.vm_xml = fobj.read()
@@ -40,7 +41,7 @@ class machine():
         self.password = password
 
     def define(self):
-        self.dom = self.con.con.defineXML(self.vm_xml)
+        self.dom = self.con.defineXML(self.vm_xml)
         if self.dom == None:
             self.log.error("Could not define VM")
             raise BaseException