Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: c87078d694d8b70344bbd0a34372fd8786bacf98
https://github.com/NixOS/nixpkgs/commit/c87078d694d8b70344bbd0a34372fd8786bacf98
Author: Bjørn Forsman <[email protected]>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M nixos/modules/services/continuous-integration/jenkins/default.nix
Log Message:
-----------
jenkins service: remove unneeded (and brittle) part of postStart
The current postStart code holds Jenkins off the "started" state until
Jenkins becomes idle. But it should be enough to wait until Jenkins
start handling HTTP requests to consider it "started".
More reasons why the current approach is bad and we should remove it,
from @coreyoconnor in
https://github.com/NixOS/nixpkgs/issues/14991#issuecomment-216572571:
1. Repeatedly curling for a specific human-readable string to
determine "Active" is fragile. For instance, what happens when jenkins
is localized?
2. The time jenkins takes to initializes is variable. This (at least
used to) depend on the number of jobs and any plugin upgrades requested.
3. Jenkins can be requested to restart from the UI. Which will not
affect the status of the service. This means that the service being
"active" does not imply jenkins is initialized. Downstream services
cannot assume jenkins is initialized if the service is active. Might
as well accept that and remove the initialized test from service
startup.
Fixes #14991.
(cherry picked from commit 51e5beca4267d4138e9ac8babb744a65f8c4bed0)
Commit: 30d582384baf08994aed6bd5b20716fbdfe79e8e
https://github.com/NixOS/nixpkgs/commit/30d582384baf08994aed6bd5b20716fbdfe79e8e
Author: Bjørn Forsman <[email protected]>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M nixos/modules/services/continuous-integration/jenkins/default.nix
Log Message:
-----------
jenkins service: improve curl call in postStart
* Perform HTTP HEAD request instead of full GET (lighter weight)
* Don't log output of curl to the journal (it's noise/debug)
* Use explicit http:// URL scheme
* Reduce poll interval from 10s to 2s (respond to state changes
quicker). Probably not relevant on boot (lots of services compete for
the CPU), but online service restarts/reloads should be quicker.
* Pass --fail to curl (should be more robust against false positives)
* Use 4 space indent for shell code.
(cherry picked from commit 78b6e8c3199c1ce8ad4744cb90b47e94739083da)
Compare: https://github.com/NixOS/nixpkgs/compare/2a72b02b5bc8...30d582384baf_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
