/mandos/trunk : revision 589.1.1

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-26 22:21:17 UTC
mto: This revision was merged to the branch mainline in revision 591.
Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh

* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

Show diffs side-by-side

added added

removed removed

mandos-monitor

domain = 'se.recompile'

server_interface = domain + '.Mandos'

client_interface = domain + '.Mandos.Client'

version = "1.6.0"

version = "1.5.4"

# Always run in monochrome mode

urwid.curses_display.curses.has_colors = lambda : False

489

self.topwidget = urwid.Pile(self.uilist)

490

491

def log_message(self, message):

492

"""Log message formatted with timestamp"""

493

492

timestamp = datetime.datetime.now().isoformat()

494

493

self.log_message_raw(timestamp + ": " + message)

495

494

585

584

try:

586

585

mandos_clients = (self.mandos_serv

587

586

.GetAllClientsWithProperties())

588

if not mandos_clients:

589

self.log_message_raw(("bold", "Note: Server has no clients."))

590

587

except dbus.exceptions.DBusException:

591

self.log_message_raw(("bold", "Note: No Mandos server running."))

592

588

mandos_clients = dbus.Dictionary()

593

589

594

590

(self.mandos_serv

Older »