coren has submitted this change and it was merged. Change subject: Tool Labs: more fixes to the lighttpd startup ......................................................................
Tool Labs: more fixes to the lighttpd startup Change-Id: I25f5eb194bac6cf0b122e329e3e377d140ae26a2 --- M modules/toollabs/files/tool-lighttpd 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/files/tool-lighttpd b/modules/toollabs/files/tool-lighttpd index 4075922..f66df5c 100755 --- a/modules/toollabs/files/tool-lighttpd +++ b/modules/toollabs/files/tool-lighttpd @@ -31,8 +31,9 @@ exit 1 fi -llock="$scoreboard.lock.$(hostname).$$" -lock="$scoreboard.lock" +export llock="$scoreboard.lock.$tool" +export lock="$scoreboard.lock" + trap "rm -f $llock" 0 touch $llock while [ -f $llock ]; do @@ -144,7 +145,7 @@ trap "cleanup;exit 0" 15 /bin/su -c "echo $user; id; set; /usr/sbin/lighttpd -f $runbase.conf -D 2>&1 >>$home/error.log" - "$user" -/bin/date "$home/lighttpd.STOPPED" +/bin/date >"$home/lighttpd.STOPPED" cleanup exit 1 -- To view, visit https://gerrit.wikimedia.org/r/89009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25f5eb194bac6cf0b122e329e3e377d140ae26a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren <[email protected]> Gerrit-Reviewer: coren <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
