/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: Teddy Hogeborn
  • Date: 2018-02-12 17:07:19 UTC
  • mfrom: (237.4.96 release)
  • Revision ID: teddy@recompile.se-20180212170719-pg26c4ob584d3xls
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
115
115
if sys.version_info.major == 2:
116
116
    str = unicode
117
117
 
118
 
version = "1.7.16"
 
118
version = "1.7.18"
119
119
stored_state_file = "clients.pickle"
120
120
 
121
121
logger = logging.getLogger()
496
496
class AvahiServiceToSyslog(AvahiService):
497
497
    def rename(self, *args, **kwargs):
498
498
        """Add the new name to the syslog messages"""
499
 
        ret = super(AvahiServiceToSyslog, self).rename(self, *args,
500
 
                                                       **kwargs)
 
499
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
501
500
        syslogger.setFormatter(logging.Formatter(
502
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
503
502
            .format(self.name)))