Skip to content

Commit

Permalink
Change master log rotation to be bounded, too, and add a note
Browse files Browse the repository at this point in the history
Also, include documentation of create-master options

Fixes #1022
  • Loading branch information
Dustin J. Mitchell committed Oct 25, 2010
1 parent f6b0d63 commit 0592222
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 5 deletions.
12 changes: 12 additions & 0 deletions master/NEWS
Expand Up @@ -4,6 +4,12 @@ Major User visible changes in Buildbot. -*- outline -*-

* NEXT RELEASE

** Upgrading

Upgrading to from the previous version will require an 'upgrade-master' run.
However, the schema changes are backward-compatible, so if a downgrade is
required, it will not be difficult.

** New Requirements

The Buildmaster now requires Jinja-2.1 or higher.
Expand All @@ -28,6 +34,12 @@ internal logging and log rotation mechanism in buildbot.tac (ticket #973)
The MasterShellCommand now provides the buildmaster's environment to the step
by default; pass env={} to pass a clean environment, instead.

** Log Rotation

The default 'create-master' output now rotates ten twistd.log files, each of
about 10MiB. This is a change from older versions, which would rotate an
unbounded number of 1MiB files.

** New configuration key, 'changeCacheSize'

This sets the number of changes that buildbot will keep in memory at once.
Expand Down
4 changes: 2 additions & 2 deletions master/buildbot/scripts/runner.py
Expand Up @@ -486,9 +486,9 @@ class MasterOptions(MakerBase):
]
optParameters = [
["config", "c", "master.cfg", "name of the buildmaster config file"],
["log-size", "s", "1000000",
["log-size", "s", "10000000",
"size at which to rotate twisted log files"],
["log-count", "l", "None",
["log-count", "l", "10",
"limit the number of kept old twisted log files"],
["db", None, "sqlite:///state.sqlite",
"which DB to use for scheduler/status state. See below for syntax."],
Expand Down
47 changes: 44 additions & 3 deletions master/docs/installation.texinfo
Expand Up @@ -216,6 +216,46 @@ If you want to use MySQL as the database backend for your Buildbot, add the
@code{--db} option to the @code{create-master} invocation to specify the
connection string for the MySQL database (@pxref{Database Specification}).

@heading Buildmaster Options

This section lists options to the @command{create-master} command.
You can also type @command{buildslave create-slave --help} for an up-to-the-moment summary.

@table @code

@item --force
With this option, @command{create-master} will re-use an existing master
directory.

@item --no-logrotate
This disables internal buildslave log management mechanism. With this option
buildslave does not override the default logfile name and its behaviour giving
a possibility to control those with command-line options of twistd daemon.

@item --relocatable
This creates a "relocatable" buildbot.tac, which uses relative paths instead
of absolute paths, so that the buildmaster directory can be moved about.

@item --config
The name of the configuration file to use. This configuration file need not
reside in the buildmaster directory.

@item --log-size
This is the size in bytes when to rotate the Twisted log files. The default is
10MiB.

@item --log-count
This is the number of log rotations to keep around. You can either
specify a number or @code{None} to keep all @file{twistd.log} files
around. The default is 10.

@item --db
The database that the Buildmaster should use. This information is needed
earlier than the configuration file can be loaded.

@end table


@node Upgrading an Existing Buildmaster
@section Upgrading an Existing Buildmaster

Expand Down Expand Up @@ -499,12 +539,13 @@ seconds. The default (300) causes the buildslave to wait at most 5
minutes before trying to connect to the buildmaster again.

@item --log-size
This is the size in bytes when to rotate the Twisted log files.
This is the size in bytes when to rotate the Twisted log files. The default is
10MiB.

@item --log-count
This is the number of log rotations to keep around. You can either
specify a number or @code{None} (the default) to keep all
@file{twistd.log} files around.
specify a number or @code{None} to keep all @file{twistd.log} files
around. The default is 10.

@end table

Expand Down
8 changes: 8 additions & 0 deletions slave/NEWS
Expand Up @@ -2,6 +2,14 @@ Major User visible changes in Buildslave. -*- outline -*-
see the git log for a detailed list of changes:
http://github.com/buildbot/buildbot/commits/master

* Next Release

** Log Rotation

The default 'create-slave' output now rotates ten twistd.log files, each of
about 10MiB. This is a change from older versions, which would rotate an
unbounded number of 1MiB files.

* Buildbot 0.8.1

** First release of buildslave as a separate package
Expand Down

0 comments on commit 0592222

Please sign in to comment.