/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-05-05 09:20:23 UTC
  • mfrom: (569.1.2 ctl-using-properties)
  • Revision ID: teddy@recompile.se-20120505092023-es5pn711z02193ny
* mandos-ctl (main): Use D-Bus properties instead of methods.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2015 Teddy Hogeborn
7
 
# Copyright © 2009-2015 Björn Påhlsson
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
17
17
#     GNU General Public License for more details.
18
18
# 
19
19
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see
21
 
# <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
21
# 
23
22
# Contact the authors at <mandos@recompile.se>.
24
23
# 
25
24
 
26
25
from __future__ import (division, absolute_import, print_function,
27
26
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
32
27
 
33
28
import sys
34
29
import os
 
30
import signal
35
31
 
36
32
import datetime
37
33
 
39
35
import urwid
40
36
 
41
37
from dbus.mainloop.glib import DBusGMainLoop
42
 
try:
43
 
    import gobject
44
 
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
38
import gobject
46
39
 
47
40
import dbus
48
41
 
 
42
import UserList
 
43
 
49
44
import locale
50
45
 
51
 
if sys.version_info.major == 2:
52
 
    str = unicode
53
 
 
54
46
locale.setlocale(locale.LC_ALL, '')
55
47
 
56
48
import logging
60
52
domain = 'se.recompile'
61
53
server_interface = domain + '.Mandos'
62
54
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
 
55
version = "1.5.3"
 
56
 
 
57
# Always run in monochrome mode
 
58
urwid.curses_display.curses.has_colors = lambda : False
 
59
 
 
60
# Urwid doesn't support blinking, but we want it.  Since we have no
 
61
# use for underline on its own, we make underline also always blink.
 
62
urwid.curses_display.curses.A_UNDERLINE |= (
 
63
    urwid.curses_display.curses.A_BLINK)
64
64
 
65
65
def isoformat_to_datetime(iso):
66
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
83
    properties and calls a hook function when any of them are
84
84
    changed.
85
85
    """
86
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
86
    def __init__(self, proxy_object=None, *args, **kwargs):
87
87
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        self.properties = dict() if properties is None else properties
 
88
        
 
89
        self.properties = dict()
89
90
        self.property_changed_match = (
90
 
            self.proxy.connect_to_signal("PropertiesChanged",
91
 
                                         self.properties_changed,
92
 
                                         dbus.PROPERTIES_IFACE,
 
91
            self.proxy.connect_to_signal("PropertyChanged",
 
92
                                         self.property_changed,
 
93
                                         client_interface,
93
94
                                         byte_arrays=True))
94
95
        
95
 
        if properties is None:
96
 
            self.properties.update(
97
 
                self.proxy.GetAll(client_interface,
98
 
                                  dbus_interface
99
 
                                  = dbus.PROPERTIES_IFACE))
100
 
        
101
 
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
96
        self.properties.update(
 
97
            self.proxy.GetAll(client_interface,
 
98
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
99
 
 
100
        #XXX This breaks good super behaviour
 
101
#        super(MandosClientPropertyCache, self).__init__(
 
102
#            *args, **kwargs)
102
103
    
103
 
    def properties_changed(self, interface, properties, invalidated):
104
 
        """This is called whenever we get a PropertiesChanged signal
105
 
        It updates the changed properties in the "properties" dict.
 
104
    def property_changed(self, property=None, value=None):
 
105
        """This is called whenever we get a PropertyChanged signal
 
106
        It updates the changed property in the "properties" dict.
106
107
        """
107
108
        # Update properties dict with new value
108
 
        self.properties.update(properties)
 
109
        self.properties[property] = value
109
110
    
110
 
    def delete(self):
 
111
    def delete(self, *args, **kwargs):
111
112
        self.property_changed_match.remove()
 
113
        super(MandosClientPropertyCache, self).__init__(
 
114
            *args, **kwargs)
112
115
 
113
116
 
114
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
116
119
    """
117
120
    
118
121
    def __init__(self, server_proxy_object=None, update_hook=None,
119
 
                 delete_hook=None, logger=None, **kwargs):
 
122
                 delete_hook=None, logger=None, *args, **kwargs):
120
123
        # Called on update
121
124
        self.update_hook = update_hook
122
125
        # Called on delete
127
130
        self.logger = logger
128
131
        
129
132
        self._update_timer_callback_tag = None
 
133
        self._update_timer_callback_lock = 0
130
134
        
131
135
        # The widget shown normally
132
136
        self._text_widget = urwid.Text("")
133
137
        # The widget shown when we have focus
134
138
        self._focus_text_widget = urwid.Text("")
135
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
139
        super(MandosClientWidget, self).__init__(
 
140
            update_hook=update_hook, delete_hook=delete_hook,
 
141
            *args, **kwargs)
136
142
        self.update()
137
143
        self.opened = False
138
144
        
 
145
        last_checked_ok = isoformat_to_datetime(self.properties
 
146
                                                ["LastCheckedOK"])
 
147
        
 
148
        if self.properties ["LastCheckerStatus"] != 0:
 
149
            self.using_timer(True)
 
150
        
 
151
        if self.need_approval:
 
152
            self.using_timer(True)
 
153
        
139
154
        self.match_objects = (
140
155
            self.proxy.connect_to_signal("CheckerCompleted",
141
156
                                         self.checker_completed,
157
172
                                         self.rejected,
158
173
                                         client_interface,
159
174
                                         byte_arrays=True))
160
 
        self.logger('Created client {}'
161
 
                    .format(self.properties["Name"]), level=0)
 
175
        #self.logger('Created client {0}'
 
176
        #            .format(self.properties["Name"]))
 
177
    
 
178
    def property_changed(self, property=None, value=None):
 
179
        super(self, MandosClientWidget).property_changed(property,
 
180
                                                         value)
 
181
        if property == "ApprovalPending":
 
182
            using_timer(bool(value))
 
183
        if property == "LastCheckerStatus":
 
184
            using_timer(value != 0)
 
185
            #self.logger('Checker for client {0} (command "{1}") was '
 
186
            #            ' successful'.format(self.properties["Name"],
 
187
            #                                 command))
162
188
    
163
189
    def using_timer(self, flag):
164
190
        """Call this method with True or False when timer should be
165
191
        activated or deactivated.
166
192
        """
167
 
        if flag and self._update_timer_callback_tag is None:
 
193
        old = self._update_timer_callback_lock
 
194
        if flag:
 
195
            self._update_timer_callback_lock += 1
 
196
        else:
 
197
            self._update_timer_callback_lock -= 1
 
198
        if old == 0 and self._update_timer_callback_lock:
168
199
            # Will update the shown timer value every second
169
200
            self._update_timer_callback_tag = (gobject.timeout_add
170
201
                                               (1000,
171
202
                                                self.update_timer))
172
 
        elif not (flag or self._update_timer_callback_tag is None):
 
203
        elif old and self._update_timer_callback_lock == 0:
173
204
            gobject.source_remove(self._update_timer_callback_tag)
174
205
            self._update_timer_callback_tag = None
175
206
    
176
 
    def checker_completed(self, exitstatus, signal, command):
 
207
    def checker_completed(self, exitstatus, condition, command):
177
208
        if exitstatus == 0:
178
 
            self.logger('Checker for client {} (command "{}")'
179
 
                        ' succeeded'.format(self.properties["Name"],
180
 
                                            command), level=0)
181
209
            self.update()
182
210
            return
183
211
        # Checker failed
184
 
        if exitstatus >= 0:
185
 
            self.logger('Checker for client {} (command "{}") failed'
186
 
                        ' with exit code {}'
187
 
                        .format(self.properties["Name"], command,
188
 
                                exitstatus))
189
 
        elif signal != 0:
190
 
            self.logger('Checker for client {} (command "{}") was'
191
 
                        ' killed by signal {}'
192
 
                        .format(self.properties["Name"], command,
193
 
                                signal))
 
212
        if os.WIFEXITED(condition):
 
213
            self.logger('Checker for client {0} (command "{1}")'
 
214
                        ' failed with exit code {2}'
 
215
                        .format(self.properties["Name"], command,
 
216
                                os.WEXITSTATUS(condition)))
 
217
        elif os.WIFSIGNALED(condition):
 
218
            self.logger('Checker for client {0} (command "{1}") was'
 
219
                        ' killed by signal {2}'
 
220
                        .format(self.properties["Name"], command,
 
221
                                os.WTERMSIG(condition)))
 
222
        elif os.WCOREDUMP(condition):
 
223
            self.logger('Checker for client {0} (command "{1}")'
 
224
                        ' dumped core'
 
225
                        .format(self.properties["Name"], command))
194
226
        else:
195
 
            self.logger('Checker for client {} completed'
 
227
            self.logger('Checker for client {0} completed'
196
228
                        ' mysteriously'
197
229
                        .format(self.properties["Name"]))
198
230
        self.update()
199
231
    
200
232
    def checker_started(self, command):
201
 
        """Server signals that a checker started."""
202
 
        self.logger('Client {} started checker "{}"'
203
 
                    .format(self.properties["Name"],
204
 
                            command), level=0)
 
233
        """Server signals that a checker started. This could be useful
 
234
           to log in the future. """
 
235
        #self.logger('Client {0} started checker "{1}"'
 
236
        #            .format(self.properties["Name"],
 
237
        #                    unicode(command)))
 
238
        pass
205
239
    
206
240
    def got_secret(self):
207
 
        self.logger('Client {} received its secret'
 
241
        self.logger('Client {0} received its secret'
208
242
                    .format(self.properties["Name"]))
209
243
    
210
244
    def need_approval(self, timeout, default):
211
245
        if not default:
212
 
            message = 'Client {} needs approval within {} seconds'
 
246
            message = 'Client {0} needs approval within {1} seconds'
213
247
        else:
214
 
            message = 'Client {} will get its secret in {} seconds'
 
248
            message = 'Client {0} will get its secret in {1} seconds'
215
249
        self.logger(message.format(self.properties["Name"],
216
250
                                   timeout/1000))
 
251
        self.using_timer(True)
217
252
    
218
253
    def rejected(self, reason):
219
 
        self.logger('Client {} was rejected; reason: {}'
 
254
        self.logger('Client {0} was rejected; reason: {1}'
220
255
                    .format(self.properties["Name"], reason))
221
256
    
222
257
    def selectable(self):
245
280
                          "bold-underline-blink":
246
281
                              "bold-underline-blink-standout",
247
282
                          }
248
 
        
 
283
 
249
284
        # Rebuild focus and non-focus widgets using current properties
250
 
        
 
285
 
251
286
        # Base part of a client. Name!
252
287
        base = '{name}: '.format(name=self.properties["Name"])
253
288
        if not self.properties["Enabled"]:
254
289
            message = "DISABLED"
255
 
            self.using_timer(False)
256
290
        elif self.properties["ApprovalPending"]:
257
291
            timeout = datetime.timedelta(milliseconds
258
292
                                         = self.properties
260
294
            last_approval_request = isoformat_to_datetime(
261
295
                self.properties["LastApprovalRequest"])
262
296
            if last_approval_request is not None:
263
 
                timer = max(timeout - (datetime.datetime.utcnow()
264
 
                                       - last_approval_request),
265
 
                            datetime.timedelta())
 
297
                timer = timeout - (datetime.datetime.utcnow()
 
298
                                   - last_approval_request)
266
299
            else:
267
300
                timer = datetime.timedelta()
268
301
            if self.properties["ApprovedByDefault"]:
269
 
                message = "Approval in {}. (d)eny?"
 
302
                message = "Approval in {0}. (d)eny?"
270
303
            else:
271
 
                message = "Denial in {}. (a)pprove?"
272
 
            message = message.format(str(timer).rsplit(".", 1)[0])
273
 
            self.using_timer(True)
 
304
                message = "Denial in {0}. (a)pprove?"
 
305
            message = message.format(unicode(timer).rsplit(".", 1)[0])
274
306
        elif self.properties["LastCheckerStatus"] != 0:
275
 
            # When checker has failed, show timer until client expires
 
307
            # When checker has failed, print a timer until client expires
276
308
            expires = self.properties["Expires"]
277
309
            if expires == "":
278
310
                timer = datetime.timedelta(0)
279
311
            else:
280
 
                expires = (datetime.datetime.strptime
281
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
282
 
                timer = max(expires - datetime.datetime.utcnow(),
283
 
                            datetime.timedelta())
 
312
                expires = datetime.datetime.strptime(expires,
 
313
                                                     '%Y-%m-%dT%H:%M:%S.%f')
 
314
                timer = expires - datetime.datetime.utcnow()
284
315
            message = ('A checker has failed! Time until client'
285
 
                       ' gets disabled: {}'
286
 
                       .format(str(timer).rsplit(".", 1)[0]))
287
 
            self.using_timer(True)
 
316
                       ' gets disabled: {0}'
 
317
                       .format(unicode(timer).rsplit(".", 1)[0]))
288
318
        else:
289
319
            message = "enabled"
290
 
            self.using_timer(False)
291
 
        self._text = "{}{}".format(base, message)
292
 
        
 
320
        self._text = "{0}{1}".format(base, message)
 
321
            
293
322
        if not urwid.supports_unicode():
294
323
            self._text = self._text.encode("ascii", "replace")
295
324
        textlist = [("normal", self._text)]
312
341
        self.update()
313
342
        return True             # Keep calling this
314
343
    
315
 
    def delete(self, **kwargs):
 
344
    def delete(self, *args, **kwargs):
316
345
        if self._update_timer_callback_tag is not None:
317
346
            gobject.source_remove(self._update_timer_callback_tag)
318
347
            self._update_timer_callback_tag = None
321
350
        self.match_objects = ()
322
351
        if self.delete_hook is not None:
323
352
            self.delete_hook(self)
324
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
353
        return super(MandosClientWidget, self).delete(*args, **kwargs)
325
354
    
326
355
    def render(self, maxcolrow, focus=False):
327
356
        """Render differently if we have focus.
369
398
        else:
370
399
            return key
371
400
    
372
 
    def properties_changed(self, interface, properties, invalidated):
373
 
        """Call self.update() if any properties changed.
 
401
    def property_changed(self, property=None, value=None,
 
402
                         *args, **kwargs):
 
403
        """Call self.update() if old value is not new value.
374
404
        This overrides the method from MandosClientPropertyCache"""
375
 
        old_values = { key: self.properties.get(key)
376
 
                       for key in properties.keys() }
377
 
        super(MandosClientWidget, self).properties_changed(
378
 
            interface, properties, invalidated)
379
 
        if any(old_values[key] != self.properties.get(key)
380
 
               for key in old_values):
 
405
        property_name = unicode(property)
 
406
        old_value = self.properties.get(property_name)
 
407
        super(MandosClientWidget, self).property_changed(
 
408
            property=property, value=value, *args, **kwargs)
 
409
        if self.properties.get(property_name) != old_value:
381
410
            self.update()
382
411
 
383
412
 
386
415
    "down" key presses, thus not allowing any containing widgets to
387
416
    use them as an excuse to shift focus away from this widget.
388
417
    """
389
 
    def keypress(self, *args, **kwargs):
390
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
418
    def keypress(self, maxcolrow, key):
 
419
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
391
420
        if ret in ("up", "down"):
392
421
            return
393
422
        return ret
397
426
    """This is the entire user interface - the whole screen
398
427
    with boxes, lists of client widgets, etc.
399
428
    """
400
 
    def __init__(self, max_log_length=1000, log_level=1):
 
429
    def __init__(self, max_log_length=1000):
401
430
        DBusGMainLoop(set_as_default=True)
402
431
        
403
432
        self.screen = urwid.curses_display.Screen()
406
435
                ("normal",
407
436
                 "default", "default", None),
408
437
                ("bold",
409
 
                 "bold", "default", "bold"),
 
438
                 "default", "default", "bold"),
410
439
                ("underline-blink",
411
 
                 "underline,blink", "default", "underline,blink"),
 
440
                 "default", "default", "underline"),
412
441
                ("standout",
413
 
                 "standout", "default", "standout"),
 
442
                 "default", "default", "standout"),
414
443
                ("bold-underline-blink",
415
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
444
                 "default", "default", ("bold", "underline")),
416
445
                ("bold-standout",
417
 
                 "bold,standout", "default", "bold,standout"),
 
446
                 "default", "default", ("bold", "standout")),
418
447
                ("underline-blink-standout",
419
 
                 "underline,blink,standout", "default",
420
 
                 "underline,blink,standout"),
 
448
                 "default", "default", ("underline", "standout")),
421
449
                ("bold-underline-blink-standout",
422
 
                 "bold,underline,blink,standout", "default",
423
 
                 "bold,underline,blink,standout"),
 
450
                 "default", "default", ("bold", "underline",
 
451
                                          "standout")),
424
452
                ))
425
453
        
426
454
        if urwid.supports_unicode():
441
469
        self.log = []
442
470
        self.max_log_length = max_log_length
443
471
        
444
 
        self.log_level = log_level
445
 
        
446
472
        # We keep a reference to the log widget so we can remove it
447
473
        # from the ListWalker without it getting destroyed
448
474
        self.logbox = ConstrainedListBox(self.log)
462
488
        self.main_loop = gobject.MainLoop()
463
489
    
464
490
    def client_not_found(self, fingerprint, address):
465
 
        self.log_message("Client with address {} and fingerprint {}"
466
 
                         " could not be found"
 
491
        self.log_message("Client with address {0} and fingerprint"
 
492
                         " {1} could not be found"
467
493
                         .format(address, fingerprint))
468
494
    
469
495
    def rebuild(self):
482
508
            self.uilist.append(self.logbox)
483
509
        self.topwidget = urwid.Pile(self.uilist)
484
510
    
485
 
    def log_message(self, message, level=1):
486
 
        """Log message formatted with timestamp"""
487
 
        if level < self.log_level:
488
 
            return
 
511
    def log_message(self, message):
489
512
        timestamp = datetime.datetime.now().isoformat()
490
 
        self.log_message_raw("{}: {}".format(timestamp, message),
491
 
                             level=level)
 
513
        self.log_message_raw(timestamp + ": " + message)
492
514
    
493
 
    def log_message_raw(self, markup, level=1):
 
515
    def log_message_raw(self, markup):
494
516
        """Add a log message to the log buffer."""
495
 
        if level < self.log_level:
496
 
            return
497
517
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
518
        if (self.max_log_length
499
519
            and len(self.log) > self.max_log_length):
506
526
        """Toggle visibility of the log buffer."""
507
527
        self.log_visible = not self.log_visible
508
528
        self.rebuild()
509
 
        self.log_message("Log visibility changed to: {}"
510
 
                         .format(self.log_visible), level=0)
 
529
        #self.log_message("Log visibility changed to: "
 
530
        #                 + unicode(self.log_visible))
511
531
    
512
532
    def change_log_display(self):
513
533
        """Change type of log display.
518
538
            self.log_wrap = "clip"
519
539
        for textwidget in self.log:
520
540
            textwidget.set_wrap_mode(self.log_wrap)
521
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
522
 
                         level=0)
 
541
        #self.log_message("Wrap mode: " + self.log_wrap)
523
542
    
524
543
    def find_and_remove_client(self, path, name):
525
544
        """Find a client by its object path and remove it.
530
549
            client = self.clients_dict[path]
531
550
        except KeyError:
532
551
            # not found?
533
 
            self.log_message("Unknown client {!r} ({!r}) removed"
 
552
            self.log_message("Unknown client {0!r} ({1!r}) removed"
534
553
                             .format(name, path))
535
554
            return
536
555
        client.delete()
554
573
        if path is None:
555
574
            path = client.proxy.object_path
556
575
        self.clients_dict[path] = client
557
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
576
        self.clients.sort(None, lambda c: c.properties["Name"])
558
577
        self.refresh()
559
578
    
560
579
    def remove_client(self, client, path=None):
562
581
        if path is None:
563
582
            path = client.proxy.object_path
564
583
        del self.clients_dict[path]
 
584
        if not self.clients_dict:
 
585
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
586
            # is completely emptied, we need to recreate it.
 
587
            self.clients = urwid.SimpleListWalker([])
 
588
            self.rebuild()
565
589
        self.refresh()
566
590
    
567
591
    def refresh(self):
580
604
        try:
581
605
            mandos_clients = (self.mandos_serv
582
606
                              .GetAllClientsWithProperties())
583
 
            if not mandos_clients:
584
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
585
607
        except dbus.exceptions.DBusException:
586
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
587
608
            mandos_clients = dbus.Dictionary()
588
609
        
589
610
        (self.mandos_serv
601
622
                            self.client_not_found,
602
623
                            dbus_interface=server_interface,
603
624
                            byte_arrays=True))
604
 
        for path, client in mandos_clients.items():
 
625
        for path, client in mandos_clients.iteritems():
605
626
            client_proxy_object = self.bus.get_object(self.busname,
606
627
                                                      path)
607
628
            self.add_client(MandosClientWidget(server_proxy_object
616
637
                                               logger
617
638
                                               =self.log_message),
618
639
                            path=path)
619
 
        
 
640
 
620
641
        self.refresh()
621
642
        self._input_callback_tag = (gobject.io_add_watch
622
643
                                    (sys.stdin.fileno(),
654
675
            elif key == "window resize":
655
676
                self.size = self.screen.get_cols_rows()
656
677
                self.refresh()
657
 
            elif key == "ctrl l":
658
 
                self.screen.clear()
 
678
            elif key == "\f":  # Ctrl-L
659
679
                self.refresh()
660
680
            elif key == "l" or key == "D":
661
681
                self.toggle_log_display()
673
693
                                            "?: Help",
674
694
                                            "l: Log window toggle",
675
695
                                            "TAB: Switch window",
676
 
                                            "w: Wrap (log lines)",
677
 
                                            "v: Toggle verbose log",
678
 
                                            ))))
 
696
                                            "w: Wrap (log)"))))
679
697
                self.log_message_raw(("bold",
680
698
                                      "  "
681
699
                                      .join(("Clients:",
694
712
                else:
695
713
                    self.topwidget.set_focus(self.logbox)
696
714
                self.refresh()
697
 
            elif key == "v":
698
 
                if self.log_level == 0:
699
 
                    self.log_level = 1
700
 
                    self.log_message("Verbose mode: Off")
701
 
                else:
702
 
                    self.log_level = 0
703
 
                    self.log_message("Verbose mode: On")
704
715
            #elif (key == "end" or key == "meta >" or key == "G"
705
716
            #      or key == ">"):
706
717
            #    pass            # xxx end-of-buffer
729
740
    ui.run()
730
741
except KeyboardInterrupt:
731
742
    ui.screen.stop()
732
 
except Exception as e:
733
 
    ui.log_message(str(e))
 
743
except Exception, e:
 
744
    ui.log_message(unicode(e))
734
745
    ui.screen.stop()
735
746
    raise