/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 DBUS-API

  • Committer: Teddy Hogeborn
  • Date: 2019-11-03 18:44:41 UTC
  • Revision ID: teddy@recompile.se-20191103184441-1vhjuf06hjqgfohh
mandos-monitor: Use Python's standard loggging module

* mandos-monitor: Use Python's standard loggging module, also for
                  warnings.  Suppress BytesWarning from urwid when
                  exiting.
  (log): New global logger object.  This replaces UserInterface
        log_message().
  (MandosClientWidget.__init__): Remove "logger" argument.
  (MandosClientWidget.using_timer): Wrap self.update_timer using new
                                    glib_safely() function.
  (glib_safely): New function to log any exceptions instead of letting
                 exceptions propagate up to GLib.
  (UserInterface.__init__): Remove "log_level" argument.  Set new
                            "loghandler" attribute, instance of new
                            "UILogHandler".
  (UserInterface.log_message): Removed.
  (UserInterface.log_message_raw): Renamed to "add_log_line"; all
                                   callers changed.  Also fix
                                   off-by-one error in max_log_length
                                   logic.
  (UserInterface.run): Add self.loghandler to logger "log". Wrap
                       self.process_input using new glib_safely()
                       function.
  (UserInterface.stop): Remove self.loghandler from logger "log".
  (UserInterface.process_input): Make verbosity toggle affect log
                                 level of logger "log".
  (UILogHandler): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
   
56
56
   | Name                    | Type | Access     | clients.conf        |
57
57
   |-------------------------+------+------------+---------------------|
 
58
   | ApprovedByDefault       | b    | Read/Write | approved_by_default |
58
59
   | ApprovalDelay (a)       | t    | Read/Write | approval_delay      |
59
60
   | ApprovalDuration (a)    | t    | Read/Write | approval_duration   |
60
61
   | ApprovalPending (b)     | b    | Read       | N/A                 |
61
 
   | ApprovedByDefault       | b    | Read/Write | approved_by_default |
62
62
   | Checker                 | s    | Read/Write | checker             |
63
63
   | CheckerRunning (c)      | b    | Read/Write | N/A                 |
64
64
   | Created (d)             | s    | Read       | N/A                 |
66
66
   | Expires (f)             | s    | Read       | N/A                 |
67
67
   | ExtendedTimeout (a)     | t    | Read/Write | extended_timeout    |
68
68
   | Fingerprint             | s    | Read       | fingerprint         |
 
69
   | KeyID                   | s    | Read       | key_id              |
69
70
   | Host                    | s    | Read/Write | host                |
70
71
   | Interval (a)            | t    | Read/Write | interval            |
71
 
   | KeyID                   | s    | Read       | key_id              |
72
72
   | LastApprovalRequest (g) | s    | Read       | N/A                 |
73
73
   | LastCheckedOK (h)       | s    | Read/Write | N/A                 |
74
74
   | LastCheckerStatus (i)   | n    | Read       | N/A                 |