/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
337
337
            try:
338
338
                logger.info(u"Starting checker %r for %s",
339
339
                            command, self.name)
 
340
                # We don't need to redirect stdout and stderr, since
 
341
                # in normal mode, that is already done by daemon(),
 
342
                # and in debug mode we don't want to.  (Stdin is
 
343
                # always replaced by /dev/null.)
340
344
                self.checker = subprocess.Popen(command,
341
345
                                                close_fds=True,
342
346
                                                shell=True, cwd="/")
343
347
                self.checker_callback_tag = gobject.child_watch_add\
344
348
                                            (self.checker.pid,
345
349
                                             self.checker_callback)
346
 
            except subprocess.OSError, error:
 
350
            except OSError, error:
347
351
                logger.error(u"Failed to start subprocess: %s",
348
352
                             error)
349
353
        # Re-run this periodically if run by gobject.timeout_add
563
567
    datetime.timedelta(1)
564
568
    >>> string_to_delta(u'1w')
565
569
    datetime.timedelta(7)
 
570
    >>> string_to_delta('5m 30s')
 
571
    datetime.timedelta(0, 330)
566
572
    """
567
 
    try:
568
 
        suffix=unicode(interval[-1])
569
 
        value=int(interval[:-1])
570
 
        if suffix == u"d":
571
 
            delta = datetime.timedelta(value)
572
 
        elif suffix == u"s":
573
 
            delta = datetime.timedelta(0, value)
574
 
        elif suffix == u"m":
575
 
            delta = datetime.timedelta(0, 0, 0, 0, value)
576
 
        elif suffix == u"h":
577
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
578
 
        elif suffix == u"w":
579
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
580
 
        else:
 
573
    timevalue = datetime.timedelta(0)
 
574
    for s in interval.split():
 
575
        try:
 
576
            suffix=unicode(s[-1])
 
577
            value=int(s[:-1])
 
578
            if suffix == u"d":
 
579
                delta = datetime.timedelta(value)
 
580
            elif suffix == u"s":
 
581
                delta = datetime.timedelta(0, value)
 
582
            elif suffix == u"m":
 
583
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
584
            elif suffix == u"h":
 
585
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
586
            elif suffix == u"w":
 
587
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
588
            else:
 
589
                raise ValueError
 
590
        except (ValueError, IndexError):
581
591
            raise ValueError
582
 
    except (ValueError, IndexError):
583
 
        raise ValueError
584
 
    return delta
 
592
        timevalue += delta
 
593
    return timevalue
585
594
 
586
595
 
587
596
def server_state_changed(state):
732
741
    # Parse config file with clients
733
742
    client_defaults = { "timeout": "1h",
734
743
                        "interval": "5m",
735
 
                        "checker": "fping -q -- %%(host)s",
 
744
                        "checker": "fping -q -- %(host)s",
 
745
                        "host": "",
736
746
                        }
737
747
    client_config = ConfigParser.SafeConfigParser(client_defaults)
738
748
    client_config.read(os.path.join(server_settings["configdir"],
772
782
        logger.critical(u"No clients defined")
773
783
        sys.exit(1)
774
784
    
775
 
    if not debug:
 
785
    if debug:
 
786
        # Redirect stdin so all checkers get /dev/null
 
787
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
788
        os.dup2(null, sys.stdin.fileno())
 
789
        if null > 2:
 
790
            os.close(null)
 
791
    else:
 
792
        # No console logging
776
793
        logger.removeHandler(console)
 
794
        # Close all input and output, do double fork, etc.
777
795
        daemon()
778
796
    
779
797
    pidfilename = "/var/run/mandos/mandos.pid"