Opened 3 years ago

Last modified 3 years ago

#3482 new undecided

remove master logic from slave/buildslave/scripts/logwatcher.py or unify implementation in master and worker

Reported by: rutsky Owned by:
Priority: major Milestone: undecided
Version: master Keywords:
Cc:

Description

logwatcher.py in master and slave source directories are almost same, but logwatcher.py in slave has logic which should made logwatcher.py to be usable in master and worker implementations.

I think we should:

1) either remove "master" logic from logwatcher.py in worker code and treat logwatcher.py in master and worker as independed modules.

2) or use exactly same logwatcher.py in master and worker sources, with support of master and worker logic.

What approach is better?

Change History (1)

comment:1 Changed 3 years ago by rutsky

BTW, this line is incorrect for about 5 years:

https://github.com/buildbot/buildbot/blob/4d733e6/slave/buildslave/scripts/logwatcher.py#L125

        if "Creating BuildSlave" in line:
            self.processtype = "buildslave"

(since this commit), and logwatcher.py in worker generates BuildmasterTimeoutError instead BuildslaveTimeoutError, but this doesn't bother anyone, because both exceptions are handled in worker code: https://github.com/buildbot/buildbot/blob/4d733e62d5570fdb9e603ebfeb333899bdb1f710/slave/buildslave/scripts/start.py#L47

Note: See TracTickets for help on using tickets.