Merge pull request #136 from Financial-Times/revert-129-set-system-code

Revert "CPP-555 expose a setSystemCode, and deprecate SYSTEM_CODE"

src/lib/app-logger.js

@@ -61,11 +61,6 @@ class AppLogger extends Logger {
 			.forEach(logger => this.logger.remove(logger));
 	}
 
-	setSystemCode (systemCode) {
-		if(this.logger.transports.splunkHEC) {
-			this.logger.transports.splunkHEC.setSystemCode(systemCode);
-		}
-	}
 }
 
 export default AppLogger;

src/lib/transports/splunkHEC.js

@@ -18,30 +18,6 @@ const throwIfNotOk = res => {
 };
 
 class SplunkHEC extends winston.Transport {
-	// name that Winston refers to the transport by
-	get name () {
-		return 'splunkHEC';
-	}
-
-	setSystemCode (systemCode) {
-		this._systemCode = systemCode;
-	}
-
-	get systemCode () {
-		if(this._systemCode) {
-			return this._systemCode;
-		} else if(process.env.SYSTEM_CODE) {
-			// fall back to legacy environment variable with a warning
-			if(!this.warnedSystemCode) {
-				console.warn('n-logger Splunk transport received the system code from the SYSTEM_CODE environment variable, which is deprecated. Call logger.setSystemCode instead');
-				this.warnedSystemCode = true;
-			}
-
-			return process.env.SYSTEM_CODE;
-		} else {
-			throw new Error('You must set the systemCode option to a valid Biz Ops system code (call logger.setSystemCode) to use the Splunk transport.');
-		}
-	}
 
 	log (level, message, meta) {
 		const httpsAgent = new https.Agent({ keepAlive: true });
@@ -50,7 +26,7 @@ class SplunkHEC extends winston.Transport {
 		const data = {
 			'time': Date.now(),
 			'host': 'localhost',
-			'source': `/var/log/apps/heroku/ft-${this.systemCode}.log`,
+			'source': `/var/log/apps/heroku/ft-${process.env.SYSTEM_CODE}.log`,
 			'sourcetype': process.env.SPLUNK_SOURCETYPE || '_json',
 			'index': process.env.SPLUNK_INDEX || 'heroku',
 			'event': formattedMessage

test/lib/transports/splunkHEC.test.js

@@ -13,9 +13,6 @@ const SplunkHEC = proxyquire('../../../dist/lib/transports/splunkHEC', {
 	'../formatter': formatter
 }).default;
 
-// required for Splunk URL
-process.env.SYSTEM_CODE = 'n-logger';
-
 describe('SplunkHEC', () => {
 
 	it('should exist', () => {