on by default

bin/next-build-tools.js

@@ -42,9 +42,14 @@ program
 	.command('configure [source] [target]')
 	.description('downloads environment variables from next-config-vars and uploads them to the current app')
 	.option('-o, --overrides <abc>', 'override these values', list)
-	.option('-d, --drain-to-splunk', 'configure to drain logs to splunk')
+	.option('-n, --no-splunk', 'configure not to drain logs to splunk')
 	.action(function(source, target, options) {
-		configure({ source: source, target: target, overrides: options.overrides }).catch(exit);
+		configure({
+			source: source,
+			target: target,
+			overrides: options.overrides,
+			splunk: !options.noSplunk
+		}).catch(exit);
 	});
 
 program

tasks/configure.js

@@ -83,20 +83,20 @@ module.exports = function(opts) {
 		.then(function() {
 			console.log(target + " config vars are set");
 		}).then(function () {
-			if (opts.drainToSplunk) {
+			if (opts.splunk) {
+				if (!process.env.SPLUNK_URL) {
+					throw 'Either set a SPLUNK_URL environment variable or run `nbt configure --no-splunk`';
+				}
 				console.log("Setting up logging to splunk");
 				return fetch('https://api.heroku.com/apps/' + target + '/log-drains', {
 						headers: authorizedPostHeaders,
 						method: 'post',
 						body: JSON.stringify({
-							url: process.env.SPLUNK_URL + normalizeName(packageJson.name)
+							url: process.env.SPLUNK_URL + target
 						})
 					})
 					.then(function () {
 						console.log(target + " logging to splunk");
-					})
-					.catch(function () {
-						console.log(target + " failed to set up logging to splunk");
 					});
 			}
 		});