<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/fd19a71f8e1cfc378283433dc803ba39852287bf">https://github.com/macports/macports-base/commit/fd19a71f8e1cfc378283433dc803ba39852287bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fd19a71f8e1cfc378283433dc803ba39852287bf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 15 01:27:10 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> add startupitem options for additional logging
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/22471
</span>---
src/port1.0/portstartupitem.tcl | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portstartupitem.tcl b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 53cb014..d6b1847 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +59,14 @@
</span> # startupitem.logevents yes/no
# Log events to the log
# - for launchd, generate log messages inside daemondo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# - daemondo verbosity is controlled by startupitem.daemondo.verbosity
</span> #
# startupitem.autostart yes/no
# Automatically load the startupitem after activating. Defaults to no.
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# startupitem.debug yes/no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable additional debug logging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - for launchd, sets the Debug key to true
</span>
package provide portstartupitem 1.0
package require portutil 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,14 +74,17 @@ package require portutil 1.0
</span> namespace eval portstartupitem {
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options startupitem.autostart startupitem.create startupitem.executable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options startupitem.autostart startupitem.debug startupitem.create \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable \
</span> startupitem.init startupitem.install startupitem.location \
startupitem.logevents startupitem.logfile startupitem.name \
startupitem.netchange startupitem.pidfile startupitem.plist \
startupitem.requires startupitem.restart startupitem.start \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.stop startupitem.type startupitem.uniquename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.stop startupitem.type startupitem.uniquename \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.daemondo.verbosity
</span>
default startupitem.autostart no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.debug no
</span> default startupitem.executable ""
default startupitem.init ""
default startupitem.install {$system_options(startupitem_install)}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +102,8 @@ default startupitem.stop ""
</span> default startupitem.type {$system_options(startupitem_type)}
default startupitem.uniquename {org.macports.${startupitem.name}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.daemondo.verbosity 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set_ui_prefix
proc portstartupitem::startupitem_create_darwin_launchd {args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +111,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> startupitem.name startupitem.uniquename startupitem.plist startupitem.location \
startupitem.init startupitem.start startupitem.stop startupitem.restart startupitem.executable \
startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.install startupitem.autostart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.install startupitem.autostart startupitem.debug
</span>
set scriptdir ${prefix}/etc/startup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,9 +236,9 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> lappend args "--restart-netchange"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # To log events then tell daemondo to log at verbosity=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To log events then tell daemondo to log at verbosity=n
</span> if {[tbool startupitem.logevents]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend args "--verbosity=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args "--verbosity=[option startupitem.daemondo.verbosity]"
</span> }
# If pidfile was specified, translate it for daemondo.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,7 +307,11 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> if { [llength ${startupitem.logfile}] } {
puts ${plist} "<key>StandardOutPath</key><string>${startupitem.logfile}</string>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool startupitem.debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${plist} "<key>Debug</key><true/>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${plist} "</dict>"
puts ${plist} "</plist>"
</pre><pre style='margin:0'>
</pre>