Merge pull request #14998 from mlschroe/master

[backend] BSServerEvents: remove superfluous newline in request_note
openSUSE · Oct 4, 2023 · c04c874 · c04c874
2 parents ffe5a31 + d936257
commit c04c874
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/backend/BSServerEvents.pm b/src/backend/BSServerEvents.pm
@@ -45,7 +45,7 @@ sub request_done {
 sub request_note {
   my ($ev, $msg) = @_;
   my $info = $ev->{'request'} ? BSServer::request_infostr($ev->{'request'}) : $ev->{'peer'};
-  print "$msg for $info\n";
+  print "$msg for $info";
 }
 
 sub replstream_timeout {

diff --git a/src/backend/bs_warden b/src/backend/bs_warden
@@ -109,14 +109,15 @@ BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup);
 $| = 1;
 $SIG{'PIPE'} = 'IGNORE';
 BSUtil::restartexit($options, 'warden', "$rundir/$runname");
-BSUtil::printlog("starting build service worker warden");
 
 # get lock
 mkdir_p($rundir);
 open(RUNLOCK, '>>', "$rundir/$runname.lock") || die("$rundir/$runname.lock: $!\n");
 flock(RUNLOCK, LOCK_EX | LOCK_NB) || die("worker warden is already running!\n");
 utime undef, undef, "$rundir/$runname.lock";
 
+BSUtil::printlog("starting build service worker warden");
+
 my %building;
 my $nextorphan = 0;
 my $xcheck = 0;