/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

  • Committer: Björn Påhlsson
  • Date: 2010-10-02 18:28:21 UTC
  • mfrom: (237.4.6 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: belorn@fukt.bsnet.se-20101002182821-cazexo9y46o0g72o
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
81
81
        SO_BINDTODEVICE = None
82
82
 
83
83
 
84
 
version = "1.2.3"
 
84
version = "1.2.1"
85
85
 
86
86
#logger = logging.getLogger(u'mandos')
87
87
logger = logging.Logger(u'mandos')
204
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
205
            logger.debug(u"Zeroconf service established.")
206
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
207
 
            logger.info(u"Zeroconf service name collision.")
 
207
            logger.warning(u"Zeroconf service name collision.")
208
208
            self.rename()
209
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
210
210
            logger.critical(u"Avahi: Error in group state changed %s",
1847
1847
        # No console logging
1848
1848
        logger.removeHandler(console)
1849
1849
    
1850
 
    # Need to fork before connecting to D-Bus
1851
 
    if not debug:
1852
 
        # Close all input and output, do double fork, etc.
1853
 
        daemon()
1854
1850
    
1855
1851
    global main_loop
1856
1852
    # From the Avahi example code
1874
1870
    if server_settings["interface"]:
1875
1871
        service.interface = (if_nametoindex
1876
1872
                             (str(server_settings[u"interface"])))
1877
 
    
 
1873
 
 
1874
    if not debug:
 
1875
        # Close all input and output, do double fork, etc.
 
1876
        daemon()
 
1877
        
1878
1878
    global multiprocessing_manager
1879
1879
    multiprocessing_manager = multiprocessing.Manager()
1880
1880