Revision f2c7bb76 nfdhcpd

b/nfdhcpd
603 603

  
604 604
    if opts.daemonize:
605 605
        d = daemon.DaemonContext()
606
        d.umask = 0022
606 607
        d.open()
607 608

  
608 609
    pidfile = open("/var/run/nfdhcpd.pid", "w")
......
615 616
    else:
616 617
        logger.setLevel(logging.INFO)
617 618

  
618
    if opts.daemonize:
619
        handler = logging.handlers.RotatingFileHandler(LOG_FILENAME,
620
                                                       maxBytes=2097152)
621
    else:
622
        handler = logging.StreamHandler()
623

  
624
    handler.setFormatter(logging.Formatter(LOG_FORMAT))
625
    logger.addHandler(handler)
626

  
627
    logging.info("Starting up")
628 619
    proxy = VMNetProxy(opts.data_path, opts.dhcp_queue,
629 620
                       opts.rs_queue, opts.ns_queue)
630 621

  
......
634 625
    except ValueError:
635 626
        uid = getpwnam(opts.user)
636 627

  
637
    logging.info("Setting capabilities and changing uid")
628
    logging.debug("Setting capabilities and changing uid")
638 629
    logging.debug("User: %s, uid: %d, gid: %d" %
639 630
                  (opts.user, uid.pw_uid, uid.pw_gid))
640 631
    capng_clear(CAPNG_SELECT_BOTH)
641 632
    capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_NET_RAW)
642 633
    capng_change_id(uid.pw_uid, uid.pw_gid,
643 634
                    CAPNG_DROP_SUPP_GRP | CAPNG_CLEAR_BOUNDING)
635

  
636
    if opts.daemonize:
637
        handler = logging.handlers.RotatingFileHandler(LOG_FILENAME,
638
                                                       maxBytes=2097152)
639
    else:
640
        handler = logging.StreamHandler()
641

  
642
    handler.setFormatter(logging.Formatter(LOG_FORMAT))
643
    logger.addHandler(handler)
644

  
644 645
    logging.info("Ready to serve requests")
645 646
    proxy.serve()
646 647

  

Also available in: Unified diff