Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove polling for fw errors - now notify will be displayed by proxyvm itself

Browse Source
This commit is contained in:
Marek Marczykowski 2011-06-04 02:54:31 +02:00
parent 0f957df4d0
commit ec3abe0fbd
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qubesmanager/main.py
View File

@ -366,7 +366,6 @@ class VmManagerWindow(QMainWindow):
row_height = 50 row_height = 50
max_visible_rows = 14 max_visible_rows = 14
update_interval = 1000 # in msec update_interval = 1000 # in msec
fw_rules_apply_check_interval = 5000
show_inactive_vms = True show_inactive_vms = True
columns_states = { 0: [0, 1], 1: [0, 2, 3] } columns_states = { 0: [0, 1], 1: [0, 2, 3] }
@ -456,7 +455,6 @@ class VmManagerWindow(QMainWindow):
self.last_measure_results = {} self.last_measure_results = {}
self.last_measure_time = time.time() self.last_measure_time = time.time()
QTimer.singleShot (self.update_interval, self.update_table) QTimer.singleShot (self.update_interval, self.update_table)
QTimer.singleShot (self.fw_rules_apply_check_interval, self.check_apply_fw_rules)
def set_table_geom_height(self): def set_table_geom_height(self):
# TODO: '6' -- WTF?! # TODO: '6' -- WTF?!
@ -911,34 +909,6 @@ class VmManagerWindow(QMainWindow):
if dialog.exec_(): if dialog.exec_():
model.apply_rules() model.apply_rules()
def check_apply_fw_rules(self):
qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_reading()
qvm_collection.load()
qvm_collection.unlock_db()
for vm in qvm_collection.values():
if vm.is_proxyvm() and vm.is_running():
error_file = "/local/domain/{0}/qubes_iptables_error".format(vm.get_xid())
error = subprocess.Popen(
["/usr/bin/xenstore-read", error_file],
stdout=subprocess.PIPE).communicate()[0]
error = error.strip(" \n\t")
if error != "":
vm.rules_applied = False
trayIcon.showMessage (
"Error applying firewall rules on '{0}'!".format(vm.name),
"ERROR: {0}".format(error.decode('string_escape')),
QSystemTrayIcon.Critical
)
retcode = subprocess.check_call (
["/usr/bin/xenstore-write", error_file, ""])
else:
vm.rules_applied = True
QTimer.singleShot(self.fw_rules_apply_check_interval, self.check_apply_fw_rules)
class QubesTrayIcon(QSystemTrayIcon): class QubesTrayIcon(QSystemTrayIcon):
def __init__(self, icon): def __init__(self, icon):
QSystemTrayIcon.__init__(self, icon) QSystemTrayIcon.__init__(self, icon)