Merge pull request #1834 from sjinks/issue-1483

Switch off labels in Phalcon\Logger\Formatter\Firephp

CHANGELOG

@@ -169,7 +169,7 @@
  - Phalcon\Image:
    - Added Phalcon\Image\Adapter, Phalcon\Image\Adapter\Gd, Phalcon\Image\Adapter\Imagick (#902, #1025, #1030, #1041, #1050, #1063, #1076, #1081, #1114, #1120, #1158, #1195, #1206, #1214, #1370)
  - Phalcon\Logger:
-   - Added FirePHP Log Adapter and Formatter (#845, #1333)
+   - Added FirePHP Log Adapter and Formatter (#845, #1333, #1483)
    - Implemented Phalcon\Logger\Adapter::isTransaction() (#1238)
    - Fixed a bug preventing the EMERGENCY log type from being displayed correctly (#1498)
    - Added Phalcon\Logger\Adapter\File::getPath() (#1495, #1508)

ext/logger/formatter/firephp.c

@@ -43,19 +43,27 @@ zend_class_entry *phalcon_logger_formatter_firephp_ce;
 PHP_METHOD(Phalcon_Logger_Formatter_Firephp, getTypeString);
 PHP_METHOD(Phalcon_Logger_Formatter_Firephp, getShowBacktrace);
 PHP_METHOD(Phalcon_Logger_Formatter_Firephp, setShowBacktrace);
+PHP_METHOD(Phalcon_Logger_Formatter_Firephp, enableLabels);
+PHP_METHOD(Phalcon_Logger_Formatter_Firephp, labelsEnabled);
 PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_firephp_getshowbacktrace, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_firephp_empty, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_firephp_setshowbacktrace, 0, 0, 0)
 	ZEND_ARG_INFO(0, show)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_firephp_enablelabels, 0, 0, 0)
+	ZEND_ARG_INFO(0, enable)
+ZEND_END_ARG_INFO()
+
 static const zend_function_entry phalcon_logger_formatter_firephp_method_entry[] = {
 	PHP_ME(Phalcon_Logger_Formatter_Firephp, getTypeString, arginfo_phalcon_logger_formatter_gettypestring, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Logger_Formatter_Firephp, getShowBacktrace, arginfo_phalcon_logger_formatter_firephp_getshowbacktrace, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Firephp, getShowBacktrace, arginfo_phalcon_logger_formatter_firephp_empty, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Formatter_Firephp, setShowBacktrace, arginfo_phalcon_logger_formatter_firephp_setshowbacktrace, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Firephp, enableLabels, arginfo_phalcon_logger_formatter_firephp_enablelabels, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Firephp, labelsEnabled, arginfo_phalcon_logger_formatter_firephp_empty, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Formatter_Firephp, format, arginfo_phalcon_logger_formatterinterface_format, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
@@ -68,6 +76,7 @@ PHALCON_INIT_CLASS(Phalcon_Logger_Formatter_Firephp){
 	PHALCON_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Firephp, logger_formatter_firephp, phalcon_logger_formatter_ce, phalcon_logger_formatter_firephp_method_entry, 0);
 
 	zend_declare_property_bool(phalcon_logger_formatter_firephp_ce, SL("_showBacktrace"), 1, ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_bool(phalcon_logger_formatter_firephp_ce, SL("_enableLabels"), 1, ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	zend_class_implements(phalcon_logger_formatter_firephp_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce);
 
@@ -89,6 +98,21 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, setShowBacktrace) {
 	phalcon_update_property_this(getThis(), SL("_showBacktrace"), *show TSRMLS_CC);
 }
 
+PHP_METHOD(Phalcon_Logger_Formatter_Firephp, enableLabels) {
+
+	zval **enable;
+
+	phalcon_fetch_params_ex(1, 0, &enable);
+
+	PHALCON_ENSURE_IS_BOOL(enable);
+	phalcon_update_property_this(getThis(), SL("_enableLabels"), *enable TSRMLS_CC);
+}
+
+PHP_METHOD(Phalcon_Logger_Formatter_Firephp, labelsEnabled) {
+
+	RETURN_MEMBER(getThis(), "_enableLabels");
+}
+
 /**
  * Returns the string meaning of a logger constant
  *
@@ -128,14 +152,15 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 
 	zval *message, *type, *type_str = NULL, *timestamp;
 	zval *payload, *body, *backtrace, *meta, *encoded;
-	zval *show_backtrace;
+	zval *show_backtrace, *enable_labels;
+	int i_show_backtrace, i_enable_labels;
 	smart_str result = { NULL, 0, 0 };
 	uint i;
 	Bucket *p;
 
 	phalcon_fetch_params(0, 3, 0, &message, &type, &timestamp);
 
-	/**
+	/*
 	 * We intentionally do not use Phalcon's MM for better performance.
 	 * All variables allocated with ALLOC_INIT_ZVAL() will have
 	 * their reference count set to 1 and therefore they can be nicely
@@ -148,15 +173,19 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 		return;
 	}
 
-	show_backtrace = phalcon_fetch_nproperty_this(getThis(), SL("_showBacktrace"), PH_NOISY TSRMLS_CC);
+	show_backtrace   = phalcon_fetch_nproperty_this(getThis(), SL("_showBacktrace"), PH_NOISY TSRMLS_CC);
+	enable_labels    = phalcon_fetch_nproperty_this(getThis(), SL("_enableLabels"), PH_NOISY TSRMLS_CC);
+	i_show_backtrace = zend_is_true(show_backtrace);
+	i_enable_labels  = zend_is_true(enable_labels);
 
-	/**
-	 * Get the backtrace. This differs for differemt PHP versions.
+	/*
+	 * Get the backtrace. This differs for different PHP versions.
 	 * 5.3.6+ allows us to skip the function arguments which will save some memory
 	 * For 5.4+ there is an extra argument.
 	 */
-	ALLOC_INIT_ZVAL(backtrace);
-	if (zend_is_true(show_backtrace)) {
+	if (i_show_backtrace) {
+		ALLOC_INIT_ZVAL(backtrace);
+
 #if PHP_VERSION_ID < 50306
 		zend_fetch_debug_backtrace(backtrace, 1, 0 TSRMLS_CC);
 #elif PHP_VERSION_ID < 50400
@@ -174,7 +203,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 			char *key;
 			uint key_len;
 
-			/**
+			/*
 			 * At this point we know that the backtrace is the array.
 			 * Again, we intentionally do not use Phalcon's API because we know
 			 * that we are working with the array / hash table and thus we can
@@ -190,28 +219,28 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 				zend_hash_move_forward_ex(ht, &pos);
 
 				if (Z_TYPE_PP(ppzval) == IS_ARRAY) {
-					/**
+					/*
 					 * Here we need to skip the latest calls into Phalcon's core.
 					 * Calls to Zend internal functions will have "file" index not set.
 					 * We remove these entries from the array.
 					 */
-					if (!found && !zend_hash_exists(Z_ARRVAL_PP(ppzval), SS("file"))) {
+					if (!found && !zend_hash_quick_exists(Z_ARRVAL_PP(ppzval), SS("file"), zend_inline_hash_func(SS("file")))) {
 						zend_hash_index_del(ht, idx);
 					}
 					else {
-						/**
+						/*
 						 * Remove args and object indices. They usually give
 						 * too much information; this is not suitable to send
 						 * in the HTTP headers
 						 */
-						zend_hash_del(Z_ARRVAL_PP(ppzval), "args", sizeof("args"));
-						zend_hash_del(Z_ARRVAL_PP(ppzval), "object", sizeof("object"));
+						zend_hash_quick_del(Z_ARRVAL_PP(ppzval), "args", sizeof("args"), zend_inline_hash_func(SS("args")));
+						zend_hash_quick_del(Z_ARRVAL_PP(ppzval), "object", sizeof("object"), zend_inline_hash_func(SS("object")));
 						found = 1;
 					}
 				}
 			}
 
-			/**
+			/*
 			 * Now we need to renumber the hash table because we removed several
 			 * heading elements. If we don't do this, json_encode() will convert
 			 * this array to a JavaScript object which is an unwanted side effect
@@ -229,7 +258,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 		}
 	}
 
-	/**
+	/*
 	 * The result will looks like this:
 	 *
 	 * array(
@@ -240,13 +269,16 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 	MAKE_STD_ZVAL(payload);
 	array_init_size(payload, 2);
 
-	ALLOC_INIT_ZVAL(meta);
+	MAKE_STD_ZVAL(meta);
 	array_init_size(meta, 4);
 	add_assoc_zval_ex(meta, SS("Type"), type_str);
-	Z_ADDREF_P(message);
-	add_assoc_zval_ex(meta, SS("Label"), message);
 
-	if (Z_TYPE_P(backtrace) == IS_ARRAY) {
+	if (i_enable_labels) {
+		Z_ADDREF_P(message);
+		add_assoc_zval_ex(meta, SS("Label"), message);
+	}
+
+	if (i_show_backtrace && Z_TYPE_P(backtrace) == IS_ARRAY) {
 		zval **ppzval;
 
 		if (likely(SUCCESS == zend_hash_index_find(Z_ARRVAL_P(backtrace), 0, (void**)&ppzval)) && likely(Z_TYPE_PP(ppzval) == IS_ARRAY)) {
@@ -267,31 +299,39 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 		}
 	}
 
-	MAKE_STD_ZVAL(body);
-	array_init_size(body, 1);
-
-	if (zend_is_true(show_backtrace)) {
-		add_assoc_zval_ex(body, SS("backtrace"), backtrace);
+	if (!i_enable_labels && !i_show_backtrace) {
+		body = message;
+		Z_ADDREF_P(body);
+	}
+	else if (i_enable_labels && !i_show_backtrace) {
+		MAKE_STD_ZVAL(body);
+		ZVAL_EMPTY_STRING(body);
 	}
 	else {
-		zval_ptr_dtor(&backtrace);
+		MAKE_STD_ZVAL(body);
+		array_init_size(body, 2);
+
+		if (i_show_backtrace) {
+			add_assoc_zval_ex(body, SS("backtrace"), backtrace);
+		}
+
+		if (!i_enable_labels) {
+			Z_ADDREF_P(message);
+			add_assoc_zval_ex(body, SS("message"), message);
+		}
 	}
 
 	add_next_index_zval(payload, meta);
 	add_next_index_zval(payload, body);
 
-	/**
-	 * Convert everything to JSON
-	 */
+	/* Convert everything to JSON */
 	ALLOC_INIT_ZVAL(encoded);
 	phalcon_json_encode(encoded, NULL, payload, 0 TSRMLS_CC);
 
-	/**
-	 * As promised, kill the payload and all associated elements
-	 */
+	/* As promised, kill the payload and all associated elements */
 	zval_ptr_dtor(&payload);
 
-	/**
+	/*
 	 * We don't want to use Phalcon's concatenation API because it
 	 * requires the memory manager. Therefore we fall back to using smart strings.
 	 * smart_str_alloc4() will allocate all required memory amount (plus some more)
@@ -301,7 +341,7 @@ PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) {
 	if (Z_TYPE_P(encoded) == IS_STRING && Z_STRVAL_P(encoded) != NULL) {
 		smart_str_alloc4(&result, (uint)(Z_STRLEN_P(encoded) + 2 + 5), 0, i);
 
-		/**
+		/*
 		 * The format is:
 		 *
 		 * <size>|[meta,body]|

ext/tests/incubator-44.phpt → ext/tests/issue-1483.phpt

@@ -1,25 +1,36 @@
 --TEST--
-Phalcon\Logger\Adapter\Firephp: Error - https://github.com/phalcon/incubator/issues/44
+\Phalcon\Logger\Formatter\Firephp without backtrace - https://github.com/phalcon/cphalcon/issues/1483
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
 <?php
 $formatter = new \Phalcon\Logger\Formatter\Firephp();
+
+assert($formatter->getShowBacktrace() === true);
+assert($formatter->labelsEnabled() === true);
+
 $formatter->setShowBacktrace(false);
+
 $logger = new \Phalcon\Logger\Adapter\Firephp("");
 $logger->setFormatter($formatter);
 $logger->log("This is a message");
 $logger->log("This is an error", \Phalcon\Logger::ERROR);
 $logger->error("This is another error");
 $logger->warning(str_repeat('x', 5000));
+
+$formatter->enableLabels(false);
+$logger->log("This is a message");
+$logger->log("This is an error", \Phalcon\Logger::ERROR);
 ?>
 --EXPECTHEADERS--
 X-Wf-Protocol-1: http://meta.wildfirehq.org/Protocol/JsonStream/0.2
 X-Wf-1-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1
 X-Wf-1-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3
-X-Wf-1-1-1-1: 47|[{"Type":"LOG","Label":"This is a message"},[]]|
-X-Wf-1-1-1-2: 48|[{"Type":"ERROR","Label":"This is an error"},[]]|
-X-Wf-1-1-1-3: 53|[{"Type":"ERROR","Label":"This is another error"},[]]|
+X-Wf-1-1-1-1: 47|[{"Type":"LOG","Label":"This is a message"},""]|
+X-Wf-1-1-1-2: 48|[{"Type":"ERROR","Label":"This is an error"},""]|
+X-Wf-1-1-1-3: 53|[{"Type":"ERROR","Label":"This is another error"},""]|
 X-Wf-1-1-1-4: 5031|[{"Type":"WARN","Label":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|\
-X-Wf-1-1-1-5: |xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},[]]|
+X-Wf-1-1-1-5: |xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"},""]|
+X-Wf-1-1-1-6: 36|[{"Type":"LOG"},"This is a message"]|
+X-Wf-1-1-1-7: 37|[{"Type":"ERROR"},"This is an error"]|
 --EXPECT--