/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-07 20:46:51 UTC
  • Revision ID: teddy@recompile.se-20120507204651-qx5o5ztwmau54mh4
* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

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
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
 
28
 
 
29
from future_builtins import *
32
30
 
33
31
import sys
34
32
import os
 
33
import signal
35
34
 
36
35
import datetime
37
36
 
39
38
import urwid
40
39
 
41
40
from dbus.mainloop.glib import DBusGMainLoop
42
 
try:
43
 
    import gobject
44
 
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
41
import gobject
46
42
 
47
43
import dbus
48
44
 
 
45
import UserList
 
46
 
49
47
import locale
50
48
 
51
 
if sys.version_info.major == 2:
52
 
    str = unicode
53
 
 
54
49
locale.setlocale(locale.LC_ALL, '')
55
50
 
56
51
import logging
60
55
domain = 'se.recompile'
61
56
server_interface = domain + '.Mandos'
62
57
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
64
 
 
65
 
try:
66
 
    dbus.OBJECT_MANAGER_IFACE
67
 
except AttributeError:
68
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
58
version = "1.5.3"
 
59
 
 
60
# Always run in monochrome mode
 
61
urwid.curses_display.curses.has_colors = lambda : False
 
62
 
 
63
# Urwid doesn't support blinking, but we want it.  Since we have no
 
64
# use for underline on its own, we make underline also always blink.
 
65
urwid.curses_display.curses.A_UNDERLINE |= (
 
66
    urwid.curses_display.curses.A_BLINK)
69
67
 
70
68
def isoformat_to_datetime(iso):
71
69
    "Parse an ISO 8601 date string to a datetime.datetime()"
92
90
        self.proxy = proxy_object # Mandos Client proxy object
93
91
        self.properties = dict() if properties is None else properties
94
92
        self.property_changed_match = (
95
 
            self.proxy.connect_to_signal("PropertiesChanged",
96
 
                                         self.properties_changed,
97
 
                                         dbus.PROPERTIES_IFACE,
 
93
            self.proxy.connect_to_signal("PropertyChanged",
 
94
                                         self._property_changed,
 
95
                                         client_interface,
98
96
                                         byte_arrays=True))
99
97
        
100
98
        if properties is None:
105
103
        
106
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
107
105
    
108
 
    def properties_changed(self, interface, properties, invalidated):
109
 
        """This is called whenever we get a PropertiesChanged signal
110
 
        It updates the changed properties in the "properties" dict.
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
 
109
    
 
110
    def property_changed(self, property=None, value=None):
 
111
        """This is called whenever we get a PropertyChanged signal
 
112
        It updates the changed property in the "properties" dict.
111
113
        """
112
114
        # Update properties dict with new value
113
 
        if interface == client_interface:
114
 
            self.properties.update(properties)
 
115
        self.properties[property] = value
115
116
    
116
117
    def delete(self):
117
118
        self.property_changed_match.remove()
133
134
        self.logger = logger
134
135
        
135
136
        self._update_timer_callback_tag = None
 
137
        self._update_timer_callback_lock = 0
136
138
        
137
139
        # The widget shown normally
138
140
        self._text_widget = urwid.Text("")
142
144
        self.update()
143
145
        self.opened = False
144
146
        
 
147
        last_checked_ok = isoformat_to_datetime(self.properties
 
148
                                                ["LastCheckedOK"])
 
149
        
 
150
        if self.properties ["LastCheckerStatus"] != 0:
 
151
            self.using_timer(True)
 
152
        
 
153
        if self.need_approval:
 
154
            self.using_timer(True)
 
155
        
145
156
        self.match_objects = (
146
157
            self.proxy.connect_to_signal("CheckerCompleted",
147
158
                                         self.checker_completed,
163
174
                                         self.rejected,
164
175
                                         client_interface,
165
176
                                         byte_arrays=True))
166
 
        self.logger('Created client {}'
167
 
                    .format(self.properties["Name"]), level=0)
 
177
        #self.logger('Created client {0}'
 
178
        #            .format(self.properties["Name"]))
 
179
    
 
180
    def property_changed(self, property=None, value=None):
 
181
        super(self, MandosClientWidget).property_changed(property,
 
182
                                                         value)
 
183
        if property == "ApprovalPending":
 
184
            using_timer(bool(value))
 
185
        if property == "LastCheckerStatus":
 
186
            using_timer(value != 0)
 
187
            #self.logger('Checker for client {0} (command "{1}") was '
 
188
            #            ' successful'.format(self.properties["Name"],
 
189
            #                                 command))
168
190
    
169
191
    def using_timer(self, flag):
170
192
        """Call this method with True or False when timer should be
171
193
        activated or deactivated.
172
194
        """
173
 
        if flag and self._update_timer_callback_tag is None:
 
195
        old = self._update_timer_callback_lock
 
196
        if flag:
 
197
            self._update_timer_callback_lock += 1
 
198
        else:
 
199
            self._update_timer_callback_lock -= 1
 
200
        if old == 0 and self._update_timer_callback_lock:
174
201
            # Will update the shown timer value every second
175
202
            self._update_timer_callback_tag = (gobject.timeout_add
176
203
                                               (1000,
177
204
                                                self.update_timer))
178
 
        elif not (flag or self._update_timer_callback_tag is None):
 
205
        elif old and self._update_timer_callback_lock == 0:
179
206
            gobject.source_remove(self._update_timer_callback_tag)
180
207
            self._update_timer_callback_tag = None
181
208
    
182
209
    def checker_completed(self, exitstatus, condition, command):
183
210
        if exitstatus == 0:
184
 
            self.logger('Checker for client {} (command "{}")'
185
 
                        ' succeeded'.format(self.properties["Name"],
186
 
                                            command), level=0)
187
211
            self.update()
188
212
            return
189
213
        # Checker failed
190
214
        if os.WIFEXITED(condition):
191
 
            self.logger('Checker for client {} (command "{}") failed'
192
 
                        ' with exit code {}'
 
215
            self.logger('Checker for client {0} (command "{1}")'
 
216
                        ' failed with exit code {2}'
193
217
                        .format(self.properties["Name"], command,
194
218
                                os.WEXITSTATUS(condition)))
195
219
        elif os.WIFSIGNALED(condition):
196
 
            self.logger('Checker for client {} (command "{}") was'
197
 
                        ' killed by signal {}'
 
220
            self.logger('Checker for client {0} (command "{1}") was'
 
221
                        ' killed by signal {2}'
198
222
                        .format(self.properties["Name"], command,
199
223
                                os.WTERMSIG(condition)))
 
224
        elif os.WCOREDUMP(condition):
 
225
            self.logger('Checker for client {0} (command "{1}")'
 
226
                        ' dumped core'
 
227
                        .format(self.properties["Name"], command))
 
228
        else:
 
229
            self.logger('Checker for client {0} completed'
 
230
                        ' mysteriously'
 
231
                        .format(self.properties["Name"]))
200
232
        self.update()
201
233
    
202
234
    def checker_started(self, command):
203
 
        """Server signals that a checker started."""
204
 
        self.logger('Client {} started checker "{}"'
205
 
                    .format(self.properties["Name"],
206
 
                            command), level=0)
 
235
        """Server signals that a checker started. This could be useful
 
236
           to log in the future. """
 
237
        #self.logger('Client {0} started checker "{1}"'
 
238
        #            .format(self.properties["Name"],
 
239
        #                    unicode(command)))
 
240
        pass
207
241
    
208
242
    def got_secret(self):
209
 
        self.logger('Client {} received its secret'
 
243
        self.logger('Client {0} received its secret'
210
244
                    .format(self.properties["Name"]))
211
245
    
212
246
    def need_approval(self, timeout, default):
213
247
        if not default:
214
 
            message = 'Client {} needs approval within {} seconds'
 
248
            message = 'Client {0} needs approval within {1} seconds'
215
249
        else:
216
 
            message = 'Client {} will get its secret in {} seconds'
 
250
            message = 'Client {0} will get its secret in {1} seconds'
217
251
        self.logger(message.format(self.properties["Name"],
218
252
                                   timeout/1000))
 
253
        self.using_timer(True)
219
254
    
220
255
    def rejected(self, reason):
221
 
        self.logger('Client {} was rejected; reason: {}'
 
256
        self.logger('Client {0} was rejected; reason: {1}'
222
257
                    .format(self.properties["Name"], reason))
223
258
    
224
259
    def selectable(self):
247
282
                          "bold-underline-blink":
248
283
                              "bold-underline-blink-standout",
249
284
                          }
250
 
        
 
285
 
251
286
        # Rebuild focus and non-focus widgets using current properties
252
 
        
 
287
 
253
288
        # Base part of a client. Name!
254
289
        base = '{name}: '.format(name=self.properties["Name"])
255
290
        if not self.properties["Enabled"]:
256
291
            message = "DISABLED"
257
 
            self.using_timer(False)
258
292
        elif self.properties["ApprovalPending"]:
259
293
            timeout = datetime.timedelta(milliseconds
260
294
                                         = self.properties
262
296
            last_approval_request = isoformat_to_datetime(
263
297
                self.properties["LastApprovalRequest"])
264
298
            if last_approval_request is not None:
265
 
                timer = max(timeout - (datetime.datetime.utcnow()
266
 
                                       - last_approval_request),
267
 
                            datetime.timedelta())
 
299
                timer = timeout - (datetime.datetime.utcnow()
 
300
                                   - last_approval_request)
268
301
            else:
269
302
                timer = datetime.timedelta()
270
303
            if self.properties["ApprovedByDefault"]:
271
 
                message = "Approval in {}. (d)eny?"
 
304
                message = "Approval in {0}. (d)eny?"
272
305
            else:
273
 
                message = "Denial in {}. (a)pprove?"
274
 
            message = message.format(str(timer).rsplit(".", 1)[0])
275
 
            self.using_timer(True)
 
306
                message = "Denial in {0}. (a)pprove?"
 
307
            message = message.format(unicode(timer).rsplit(".", 1)[0])
276
308
        elif self.properties["LastCheckerStatus"] != 0:
277
309
            # When checker has failed, show timer until client expires
278
310
            expires = self.properties["Expires"]
281
313
            else:
282
314
                expires = (datetime.datetime.strptime
283
315
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
284
 
                timer = max(expires - datetime.datetime.utcnow(),
285
 
                            datetime.timedelta())
 
316
                timer = expires - datetime.datetime.utcnow()
286
317
            message = ('A checker has failed! Time until client'
287
 
                       ' gets disabled: {}'
288
 
                       .format(str(timer).rsplit(".", 1)[0]))
289
 
            self.using_timer(True)
 
318
                       ' gets disabled: {0}'
 
319
                       .format(unicode(timer).rsplit(".", 1)[0]))
290
320
        else:
291
321
            message = "enabled"
292
 
            self.using_timer(False)
293
 
        self._text = "{}{}".format(base, message)
294
 
        
 
322
        self._text = "{0}{1}".format(base, message)
 
323
            
295
324
        if not urwid.supports_unicode():
296
325
            self._text = self._text.encode("ascii", "replace")
297
326
        textlist = [("normal", self._text)]
335
364
        """Handle keys.
336
365
        This overrides the method from urwid.FlowWidget"""
337
366
        if key == "+":
338
 
            self.proxy.Set(client_interface, "Enabled",
339
 
                           dbus.Boolean(True), ignore_reply = True,
340
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
367
            self.proxy.Enable(dbus_interface = client_interface,
 
368
                              ignore_reply=True)
341
369
        elif key == "-":
342
 
            self.proxy.Set(client_interface, "Enabled", False,
343
 
                           ignore_reply = True,
344
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
370
            self.proxy.Disable(dbus_interface = client_interface,
 
371
                               ignore_reply=True)
345
372
        elif key == "a":
346
373
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
347
374
                               dbus_interface = client_interface,
355
382
                                                  .object_path,
356
383
                                                  ignore_reply=True)
357
384
        elif key == "s":
358
 
            self.proxy.Set(client_interface, "CheckerRunning",
359
 
                           dbus.Boolean(True), ignore_reply = True,
360
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
385
            self.proxy.StartChecker(dbus_interface = client_interface,
 
386
                                    ignore_reply=True)
361
387
        elif key == "S":
362
 
            self.proxy.Set(client_interface, "CheckerRunning",
363
 
                           dbus.Boolean(False), ignore_reply = True,
364
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
388
            self.proxy.StopChecker(dbus_interface = client_interface,
 
389
                                   ignore_reply=True)
365
390
        elif key == "C":
366
391
            self.proxy.CheckedOK(dbus_interface = client_interface,
367
392
                                 ignore_reply=True)
375
400
        else:
376
401
            return key
377
402
    
378
 
    def properties_changed(self, interface, properties, invalidated):
379
 
        """Call self.update() if any properties changed.
 
403
    def property_changed(self, property=None, **kwargs):
 
404
        """Call self.update() if old value is not new value.
380
405
        This overrides the method from MandosClientPropertyCache"""
381
 
        old_values = { key: self.properties.get(key)
382
 
                       for key in properties.keys() }
383
 
        super(MandosClientWidget, self).properties_changed(
384
 
            interface, properties, invalidated)
385
 
        if any(old_values[key] != self.properties.get(key)
386
 
               for key in old_values):
 
406
        property_name = unicode(property)
 
407
        old_value = self.properties.get(property_name)
 
408
        super(MandosClientWidget, self).property_changed(
 
409
            property=property, **kwargs)
 
410
        if self.properties.get(property_name) != old_value:
387
411
            self.update()
388
412
 
389
413
 
403
427
    """This is the entire user interface - the whole screen
404
428
    with boxes, lists of client widgets, etc.
405
429
    """
406
 
    def __init__(self, max_log_length=1000, log_level=1):
 
430
    def __init__(self, max_log_length=1000):
407
431
        DBusGMainLoop(set_as_default=True)
408
432
        
409
433
        self.screen = urwid.curses_display.Screen()
412
436
                ("normal",
413
437
                 "default", "default", None),
414
438
                ("bold",
415
 
                 "bold", "default", "bold"),
 
439
                 "default", "default", "bold"),
416
440
                ("underline-blink",
417
 
                 "underline,blink", "default", "underline,blink"),
 
441
                 "default", "default", "underline"),
418
442
                ("standout",
419
 
                 "standout", "default", "standout"),
 
443
                 "default", "default", "standout"),
420
444
                ("bold-underline-blink",
421
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
445
                 "default", "default", ("bold", "underline")),
422
446
                ("bold-standout",
423
 
                 "bold,standout", "default", "bold,standout"),
 
447
                 "default", "default", ("bold", "standout")),
424
448
                ("underline-blink-standout",
425
 
                 "underline,blink,standout", "default",
426
 
                 "underline,blink,standout"),
 
449
                 "default", "default", ("underline", "standout")),
427
450
                ("bold-underline-blink-standout",
428
 
                 "bold,underline,blink,standout", "default",
429
 
                 "bold,underline,blink,standout"),
 
451
                 "default", "default", ("bold", "underline",
 
452
                                          "standout")),
430
453
                ))
431
454
        
432
455
        if urwid.supports_unicode():
447
470
        self.log = []
448
471
        self.max_log_length = max_log_length
449
472
        
450
 
        self.log_level = log_level
451
 
        
452
473
        # We keep a reference to the log widget so we can remove it
453
474
        # from the ListWalker without it getting destroyed
454
475
        self.logbox = ConstrainedListBox(self.log)
468
489
        self.main_loop = gobject.MainLoop()
469
490
    
470
491
    def client_not_found(self, fingerprint, address):
471
 
        self.log_message("Client with address {} and fingerprint {}"
472
 
                         " could not be found"
 
492
        self.log_message("Client with address {0} and fingerprint"
 
493
                         " {1} could not be found"
473
494
                         .format(address, fingerprint))
474
495
    
475
496
    def rebuild(self):
488
509
            self.uilist.append(self.logbox)
489
510
        self.topwidget = urwid.Pile(self.uilist)
490
511
    
491
 
    def log_message(self, message, level=1):
492
 
        """Log message formatted with timestamp"""
493
 
        if level < self.log_level:
494
 
            return
 
512
    def log_message(self, message):
495
513
        timestamp = datetime.datetime.now().isoformat()
496
 
        self.log_message_raw("{}: {}".format(timestamp, message),
497
 
                             level=level)
 
514
        self.log_message_raw(timestamp + ": " + message)
498
515
    
499
 
    def log_message_raw(self, markup, level=1):
 
516
    def log_message_raw(self, markup):
500
517
        """Add a log message to the log buffer."""
501
 
        if level < self.log_level:
502
 
            return
503
518
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
504
519
        if (self.max_log_length
505
520
            and len(self.log) > self.max_log_length):
512
527
        """Toggle visibility of the log buffer."""
513
528
        self.log_visible = not self.log_visible
514
529
        self.rebuild()
515
 
        self.log_message("Log visibility changed to: {}"
516
 
                         .format(self.log_visible), level=0)
 
530
        #self.log_message("Log visibility changed to: "
 
531
        #                 + unicode(self.log_visible))
517
532
    
518
533
    def change_log_display(self):
519
534
        """Change type of log display.
524
539
            self.log_wrap = "clip"
525
540
        for textwidget in self.log:
526
541
            textwidget.set_wrap_mode(self.log_wrap)
527
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
528
 
                         level=0)
 
542
        #self.log_message("Wrap mode: " + self.log_wrap)
529
543
    
530
 
    def find_and_remove_client(self, path, interfaces):
 
544
    def find_and_remove_client(self, path, name):
531
545
        """Find a client by its object path and remove it.
532
546
        
533
 
        This is connected to the InterfacesRemoved signal from the
 
547
        This is connected to the ClientRemoved signal from the
534
548
        Mandos server object."""
535
 
        if client_interface not in interfaces:
536
 
            # Not a Mandos client object; ignore
537
 
            return
538
549
        try:
539
550
            client = self.clients_dict[path]
540
551
        except KeyError:
541
552
            # not found?
542
 
            self.log_message("Unknown client {!r} removed"
543
 
                             .format(path))
 
553
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
554
                             .format(name, path))
544
555
            return
545
556
        client.delete()
546
557
    
547
 
    def add_new_client(self, path, ifs_and_props):
548
 
        """Find a client by its object path and remove it.
549
 
        
550
 
        This is connected to the InterfacesAdded signal from the
551
 
        Mandos server object.
552
 
        """
553
 
        if client_interface not in ifs_and_props:
554
 
            # Not a Mandos client object; ignore
555
 
            return
 
558
    def add_new_client(self, path):
556
559
        client_proxy_object = self.bus.get_object(self.busname, path)
557
560
        self.add_client(MandosClientWidget(server_proxy_object
558
561
                                           =self.mandos_serv,
563
566
                                           delete_hook
564
567
                                           =self.remove_client,
565
568
                                           logger
566
 
                                           =self.log_message,
567
 
                                           properties
568
 
                                           = dict(ifs_and_props[
569
 
                                               client_interface])),
 
569
                                           =self.log_message),
570
570
                        path=path)
571
571
    
572
572
    def add_client(self, client, path=None):
574
574
        if path is None:
575
575
            path = client.proxy.object_path
576
576
        self.clients_dict[path] = client
577
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
577
        self.clients.sort(None, lambda c: c.properties["Name"])
578
578
        self.refresh()
579
579
    
580
580
    def remove_client(self, client, path=None):
582
582
        if path is None:
583
583
            path = client.proxy.object_path
584
584
        del self.clients_dict[path]
 
585
        if not self.clients_dict:
 
586
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
587
            # is completely emptied, we need to recreate it.
 
588
            self.clients = urwid.SimpleListWalker([])
 
589
            self.rebuild()
585
590
        self.refresh()
586
591
    
587
592
    def refresh(self):
600
605
        try:
601
606
            mandos_clients = (self.mandos_serv
602
607
                              .GetAllClientsWithProperties())
603
 
            if not mandos_clients:
604
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
605
608
        except dbus.exceptions.DBusException:
606
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
607
609
            mandos_clients = dbus.Dictionary()
608
610
        
609
611
        (self.mandos_serv
610
 
         .connect_to_signal("InterfacesRemoved",
 
612
         .connect_to_signal("ClientRemoved",
611
613
                            self.find_and_remove_client,
612
 
                            dbus_interface
613
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
614
                            dbus_interface=server_interface,
614
615
                            byte_arrays=True))
615
616
        (self.mandos_serv
616
 
         .connect_to_signal("InterfacesAdded",
 
617
         .connect_to_signal("ClientAdded",
617
618
                            self.add_new_client,
618
 
                            dbus_interface
619
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
619
                            dbus_interface=server_interface,
620
620
                            byte_arrays=True))
621
621
        (self.mandos_serv
622
622
         .connect_to_signal("ClientNotFound",
623
623
                            self.client_not_found,
624
624
                            dbus_interface=server_interface,
625
625
                            byte_arrays=True))
626
 
        for path, client in mandos_clients.items():
 
626
        for path, client in mandos_clients.iteritems():
627
627
            client_proxy_object = self.bus.get_object(self.busname,
628
628
                                                      path)
629
629
            self.add_client(MandosClientWidget(server_proxy_object
676
676
            elif key == "window resize":
677
677
                self.size = self.screen.get_cols_rows()
678
678
                self.refresh()
679
 
            elif key == "ctrl l":
680
 
                self.screen.clear()
 
679
            elif key == "\f":  # Ctrl-L
681
680
                self.refresh()
682
681
            elif key == "l" or key == "D":
683
682
                self.toggle_log_display()
695
694
                                            "?: Help",
696
695
                                            "l: Log window toggle",
697
696
                                            "TAB: Switch window",
698
 
                                            "w: Wrap (log lines)",
699
 
                                            "v: Toggle verbose log",
700
 
                                            ))))
 
697
                                            "w: Wrap (log)"))))
701
698
                self.log_message_raw(("bold",
702
699
                                      "  "
703
700
                                      .join(("Clients:",
716
713
                else:
717
714
                    self.topwidget.set_focus(self.logbox)
718
715
                self.refresh()
719
 
            elif key == "v":
720
 
                if self.log_level == 0:
721
 
                    self.log_level = 1
722
 
                    self.log_message("Verbose mode: Off")
723
 
                else:
724
 
                    self.log_level = 0
725
 
                    self.log_message("Verbose mode: On")
726
716
            #elif (key == "end" or key == "meta >" or key == "G"
727
717
            #      or key == ">"):
728
718
            #    pass            # xxx end-of-buffer
751
741
    ui.run()
752
742
except KeyboardInterrupt:
753
743
    ui.screen.stop()
754
 
except Exception as e:
755
 
    ui.log_message(str(e))
 
744
except Exception, e:
 
745
    ui.log_message(unicode(e))
756
746
    ui.screen.stop()
757
747
    raise