/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-11-14 21:03:24 UTC
  • Revision ID: teddy@recompile.se-20121114210324-n7m7k0ki2ncmje3a
* mandos-ctl (string_to_delta): Try to parse RFC 3339 duration before
                                anything else.  This also minimizes
                                the changes from the last release.
  (PGPEngine): Use straight subprocess.Popen() to call "gpg".
* mandos-monitor (UserInterface.run): Fix grammar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
55
55
domain = 'se.recompile'
56
56
server_interface = domain + '.Mandos'
57
57
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.5"
 
58
version = "1.6.0"
59
59
 
60
60
# Always run in monochrome mode
61
61
urwid.curses_display.curses.has_colors = lambda : False
489
489
        self.topwidget = urwid.Pile(self.uilist)
490
490
    
491
491
    def log_message(self, message):
 
492
        """Log message formatted with timestamp"""
492
493
        timestamp = datetime.datetime.now().isoformat()
493
494
        self.log_message_raw(timestamp + ": " + message)
494
495
    
584
585
        try:
585
586
            mandos_clients = (self.mandos_serv
586
587
                              .GetAllClientsWithProperties())
 
588
            if not mandos_clients:
 
589
                self.log_message_raw(("bold", "Note: Server has no clients."))
587
590
        except dbus.exceptions.DBusException:
 
591
            self.log_message_raw(("bold", "Note: No Mandos server running."))
588
592
            mandos_clients = dbus.Dictionary()
589
593
        
590
594
        (self.mandos_serv