/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: 2010-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
155
155
                self.last_checker_failed = False
156
156
                gobject.source_remove(self._update_timer_callback_tag)
157
157
                self._update_timer_callback_tag = None
158
 
            self.logger(u'Checker for client %s (command "%s")'
159
 
                        u' was successful'
160
 
                        % (self.properties[u"Name"], command))
 
158
            #self.logger(u'Checker for client %s (command "%s")'
 
159
            #            u' was successful'
 
160
            #            % (self.properties[u"Name"], command))
161
161
            self.update()
162
162
            return
163
163
        # Checker failed
256
256
                    self.properties[u"LastEnabled"]))
257
257
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
258
258
            message = (u'A checker has failed! Time until client'
259
 
                       u' gets diabled: %s'
 
259
                       u' gets disabled: %s'
260
260
                           % unicode(timer).rsplit(".", 1)[0])
261
261
        else:
262
262
            message = u"enabled"
325
325
#             self.proxy.unpause()
326
326
#         elif key == u"RET":
327
327
#             self.open()
328
 
#        elif key == u"+":
329
 
#            self.proxy.Approve(True)
330
 
#        elif key == u"-":
331
 
#            self.proxy.Approve(False)
332
328
        else:
333
329
            return key
334
330
    
504
500
        """Toggle visibility of the log buffer."""
505
501
        self.log_visible = not self.log_visible
506
502
        self.rebuild()
507
 
        self.log_message(u"Log visibility changed to: "
508
 
                         + unicode(self.log_visible))
 
503
        #self.log_message(u"Log visibility changed to: "
 
504
        #                 + unicode(self.log_visible))
509
505
    
510
506
    def change_log_display(self):
511
507
        """Change type of log display.
516
512
            self.log_wrap = u"clip"
517
513
        for textwidget in self.log:
518
514
            textwidget.set_wrap_mode(self.log_wrap)
519
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
515
        #self.log_message(u"Wrap mode: " + self.log_wrap)
520
516
    
521
517
    def find_and_remove_client(self, path, name):
522
518
        """Find an client from its object path and remove it.