jenkins-bot has submitted this change and it was merged.
Change subject: Don't swallow console output from helper scripts unless
`--quiet` is given.
......................................................................
Don't swallow console output from helper scripts unless `--quiet` is given.
Change-Id: I5cc46be37030e7464110e0470feb20f15eaa779d
---
M scripts/clear-host-cache.js
M scripts/clear-queue.js
M scripts/run-garbage-collect.js
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/clear-host-cache.js b/scripts/clear-host-cache.js
index 8edb445..a41942d 100755
--- a/scripts/clear-host-cache.js
+++ b/scripts/clear-host-cache.js
@@ -56,7 +56,7 @@
.usage('[options] <hostname ...>')
.option( '-c, --config <path>', 'Path to the local configuration file' )
.option( '-f, --force', 'Remove even pending jobs' )
- .option( '--quiet', "Don't add stdout to configured loggers")
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
diff --git a/scripts/clear-queue.js b/scripts/clear-queue.js
index 0e1103c..8592b78 100755
--- a/scripts/clear-queue.js
+++ b/scripts/clear-queue.js
@@ -40,10 +40,11 @@
commander
.version( cli.version )
.option( '-c, --config <path>', 'Path to the local configuration file' )
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
-cli.setupLogging( config );
+cli.setupLogging( config, !commander.quiet );
/* === Do the deed ========================================================
* Basically, we check the number of entries in the list before, and then
diff --git a/scripts/run-garbage-collect.js b/scripts/run-garbage-collect.js
index 7ff96c2..7a4d672 100755
--- a/scripts/run-garbage-collect.js
+++ b/scripts/run-garbage-collect.js
@@ -37,10 +37,11 @@
commander
.version( cli.version )
.option( '-c, --config <path>', 'Path to the local configuration file' )
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
-cli.setupLogging( config );
+cli.setupLogging( config, !commander.quiet );
cli.setupStatsD( config );
/* === Do the deed ========================================================= */
--
To view, visit https://gerrit.wikimedia.org/r/177383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc46be37030e7464110e0470feb20f15eaa779d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
