qubes/vm: fix logging
This commit is contained in:
parent
45977fc873
commit
186b277418
@ -1123,6 +1123,7 @@ class Qubes(PropertyHolder):
|
|||||||
def __init__(self, store='/var/lib/qubes/qubes.xml'):
|
def __init__(self, store='/var/lib/qubes/qubes.xml'):
|
||||||
super(Qubes, self).__init__(xml=None)
|
super(Qubes, self).__init__(xml=None)
|
||||||
|
|
||||||
|
#: logger instance for logging global messages
|
||||||
self.log = logging.getLogger('app')
|
self.log = logging.getLogger('app')
|
||||||
|
|
||||||
# pylint: disable=no-member
|
# pylint: disable=no-member
|
||||||
|
@ -41,6 +41,7 @@ import xml.parsers.expat
|
|||||||
import lxml.etree
|
import lxml.etree
|
||||||
|
|
||||||
import qubes
|
import qubes
|
||||||
|
import qubes.log
|
||||||
import qubes.events
|
import qubes.events
|
||||||
import qubes.plugins
|
import qubes.plugins
|
||||||
|
|
||||||
@ -180,8 +181,6 @@ class BaseVM(qubes.PropertyHolder):
|
|||||||
# check if properties are appropriate
|
# check if properties are appropriate
|
||||||
all_names = set(prop.__name__ for prop in self.property_list())
|
all_names = set(prop.__name__ for prop in self.property_list())
|
||||||
|
|
||||||
sys.stderr.write('all_names={!r}\n'.format(all_names))
|
|
||||||
|
|
||||||
for node in self.xml.xpath('./properties/property'):
|
for node in self.xml.xpath('./properties/property'):
|
||||||
name = node.get('name')
|
name = node.get('name')
|
||||||
if not name in all_names:
|
if not name in all_names:
|
||||||
@ -189,6 +188,14 @@ class BaseVM(qubes.PropertyHolder):
|
|||||||
'property {!r} not applicable to {!r}'.format(
|
'property {!r} not applicable to {!r}'.format(
|
||||||
name, self.__class__.__name__))
|
name, self.__class__.__name__))
|
||||||
|
|
||||||
|
#: logger instance for logging messages related to this VM
|
||||||
|
self.log = None
|
||||||
|
|
||||||
|
|
||||||
|
def init_log(self):
|
||||||
|
'''Initialise logger for this domain.'''
|
||||||
|
self.log = qubes.log.get_vm_logger(self.name)
|
||||||
|
|
||||||
|
|
||||||
def add_new_vm(self, vm):
|
def add_new_vm(self, vm):
|
||||||
'''Add new Virtual Machine to colletion
|
'''Add new Virtual Machine to colletion
|
||||||
|
Loading…
Reference in New Issue
Block a user