the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Require full logs everywhere

Browse source
This commit is contained in:
Graham Christensen 2018-03-18 16:03:38 -04:00
parent 29fadfaa4b
commit 789986a1a0
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ofborg/src/bin/builder.rs
View file

@ -25,18 +25,16 @@ fn main() {
let cloner = checkout::cached_cloner(Path::new(&cfg.checkout.root)); let cloner = checkout::cached_cloner(Path::new(&cfg.checkout.root));
let nix = cfg.nix(); let nix = cfg.nix();
let full_logs: bool = match &cfg.feedback { if &cfg.feedback.full_logs != Some(true) {
&Some(ref feedback) => feedback.full_logs, warn!("Please define feedback.full_logs in your configuration to true!");
&None => { warn!("feedback.full_logs when true will cause the full build log to be sent back");
warn!("Please define feedback.full_logs in your configuration to true or false!"); warn!("to the server, and be viewable by everyone.");
warn!("feedback.full_logs when true will cause the full build log to be sent back"); warn!("");
warn!("to the server, and be viewable by everyone."); warn!("Builders are no longer allowed to operate with this off");
warn!("I strongly encourage everybody turn this on!"); warn!("so your builder will no longer start.");
false panic!();
}
}; };
let mut session = easyamqp::session_from_config(&cfg.rabbitmq).unwrap(); let mut session = easyamqp::session_from_config(&cfg.rabbitmq).unwrap();
let mut channel = session.open_channel(1).unwrap(); let mut channel = session.open_channel(1).unwrap();
channel.basic_prefetch(1).unwrap(); channel.basic_prefetch(1).unwrap();

2
ofborg/src/config.rs
View file

@ -15,7 +15,7 @@ use ofborg::acl;
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct Config { pub struct Config {
pub runner: RunnerConfig, pub runner: RunnerConfig,
pub feedback: Option<FeedbackConfig>, pub feedback: FeedbackConfig,
pub checkout: CheckoutConfig, pub checkout: CheckoutConfig,
pub nix: NixConfig, pub nix: NixConfig,
pub rabbitmq: RabbitMQConfig, pub rabbitmq: RabbitMQConfig,

10
ofborg/src/tasks/build.rs
View file

@ -23,7 +23,6 @@ pub struct BuildWorker {
nix: nix::Nix, nix: nix::Nix,
system: String, system: String,
identity: String, identity: String,
full_logs: bool,
} }
impl BuildWorker { impl BuildWorker {
@ -32,14 +31,12 @@ impl BuildWorker {
nix: nix::Nix, nix: nix::Nix,
system: String, system: String,
identity: String, identity: String,
full_logs: bool,
) -> BuildWorker { ) -> BuildWorker {
return BuildWorker { return BuildWorker {
cloner: cloner, cloner: cloner,
nix: nix, nix: nix,
system: system, system: system,
identity: identity, identity: identity,
full_logs: full_logs,
}; };
} }
@ -346,20 +343,15 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
let mut snippet_log = VecDeque::with_capacity(10); let mut snippet_log = VecDeque::with_capacity(10);
if !self.full_logs {
actions.log_line("Full logs are disabled on this builder.");
}
for line in spawned.lines().iter() { for line in spawned.lines().iter() {
if self.full_logs {
actions.log_line(&line);
}
if snippet_log.len() >= 10 { if snippet_log.len() >= 10 {
snippet_log.pop_front(); snippet_log.pop_front();
} }
snippet_log.push_back(line.to_owned()); snippet_log.push_back(line.to_owned());
actions.log_line(&line);
} }
let success = match spawned.wait() { let success = match spawned.wait() {