Merge pull request #38 from Financial-Times/handle-value-with-equals

Handle equals sign in field value

src/lib/format.js

@@ -1,21 +1,21 @@
 const sanitise = value => (typeof value === 'string') ? value.replace(/"/g, '\'').replace(/\n/g, '	') : value;
 
-const formatMessage = message => sanitise(message);
-
-const formatValue = value => {
+const splunkifyValue = value => {
 	if (Array.isArray(value)) {
 		return `"${value.map(sanitise).join(',')}"`;
 	} else {
 		const sanitisedValue = sanitise(value);
 		// wrap in quotes, if it contains a space
-		return (/\s/.test(sanitisedValue)) ? `"${sanitisedValue}"` : sanitisedValue;
+		return (/[\s=]/.test(sanitisedValue)) ? `"${sanitisedValue}"` : sanitisedValue;
 	}
 };
 
+const formatMessage = message => sanitise(message);
+
 const formatFields = (fields = {}, { splunkFriendly = false } = {}) => {
 	const formattedFields = Object.keys(fields)
 		.map(fieldName => {
-			const fieldValue = splunkFriendly ? formatValue(fields[fieldName]) : fields[fieldName];
+			const fieldValue = splunkFriendly ? splunkifyValue(fields[fieldName]) : fields[fieldName];
 			return `${fieldName}=${fieldValue}`;
 		});
 

test/lib/format.test.js

@@ -67,6 +67,13 @@ describe('Format', () => {
 				format.fields(meta, { splunkFriendly: true }).should.equal('msg="Bad response"');
 			});
 
+			it('should wrap values with equals (`=`) in double quotes', () => {
+				const meta = {
+					msg: 'Bad=response'
+				};
+				format.fields(meta, { splunkFriendly: true }).should.equal('msg="Bad=response"');
+			});
+
 			it('should convert double quotes to singles', () => {
 				const meta = {
 					msg: 'Server responded with "Bad Request", 400'