<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3273] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins: WordCamp WP-CLI: Add a command to format our custom log entries.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3273">3273</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3273","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-30 18:15:50 +0000 (Mon, 30 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp WP-CLI: Add a command to format our custom log entries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0loggerphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginswpclicommandsmiscellaneousphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0loggerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php 2016-05-30 17:39:04 UTC (rev 3272)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php 2016-05-30 18:15:50 UTC (rev 3273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $data && ! is_scalar( $data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = (array) $data;
</span><span class="cx" style="display: block; padding: 0 10px"> redact_keys( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = str_replace( "\n", '[newline]', serialize( $data ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = str_replace( "\n", '[newline]', wp_json_encode( $data ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $log_entry = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $backtrace[0]['line'],
</span><span class="cx" style="display: block; padding: 0 10px"> $backtrace[1]['function'],
</span><span class="cx" style="display: block; padding: 0 10px"> $error_code,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data ? ' - ' . $data : ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data ? ' -- ' . $data : ''
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> error_log( $log_entry );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,3 +66,39 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Format entries created with log()
+ *
+ * See WordCamp_CLI_Miscellaneous::format_log() for usage instructions.
+ *
+ * @param string $raw_log
+ * @param string $foreign_entries `ignore` or `include` entries that weren't created with log()
+ *
+ * @return string
+ */
+function format_log( $raw_log, $foreign_entries = 'include' ) {
+ $formatted_log = '';
+ $raw_entries = explode( "\n", $raw_log );
+ $native_entry_pattern = '/(\[.*?\]) (.*?:.*?) - (.*?) -- (\{.*\})/';
+
+ foreach ( $raw_entries as $entry ) {
+ $is_native_entry = 1 === preg_match( $native_entry_pattern, $entry, $entry_parts );
+
+ if ( $is_native_entry ) {
+ $formatted_log .= sprintf(
+ "\n%s %s - %s\n%s",
+ $entry_parts[1],
+ $entry_parts[2],
+ $entry_parts[3],
+ print_r( json_decode( $entry_parts[4] ), true )
+ );
+ } else {
+ if ( 'ignore' !== $foreign_entries ) {
+ $formatted_log .= $entry . "\n";
+ }
+ }
+ }
+
+ return $formatted_log;
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginswpclicommandsmiscellaneousphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php 2016-05-30 17:39:04 UTC (rev 3272)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wp-cli-commands/miscellaneous.php 2016-05-30 18:15:50 UTC (rev 3273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,4 +89,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WP_CLI::warning( 'This was only a dry-run.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Print a log with our custom entries formatted for humans
+ *
+ * ## OPTIONS
+ *
+ * <raw_log>
+ * : The raw log contents, or the filename of the raw log
+ *
+ * [--foreign=<action>]
+ * : Include foreign log entries from the output, or ignore them
+ * ---
+ * default: include
+ * options:
+ * - include
+ * - ignore
+ * ---
+ *
+ * ## EXAMPLES
+ *
+ * wp wc-misc format-log /var/log/php-errors.log
+ * wp wc-misc format-log "$(grep 'foo' /var/log/php-errors.log -A 10 -B 10)" |less -S
+ * wp wc-misc format-log "$(grep 'bar' /var/log/php-errors.log)" --foreign=ignore
+ *
+ * @subcommand format-log
+ *
+ * @param array $args
+ * @param array $assoc_args
+ */
+ public function format_log( $args, $assoc_args ) {
+ list( $raw_log ) = $args;
+
+ if ( is_file( $raw_log ) ) {
+ $raw_log = file_get_contents( $raw_log );
+ }
+
+ $formatted_log = \WordCamp\Logger\format_log( $raw_log, $assoc_args['foreign'] );
+
+ WP_CLI::line( "\n" . $formatted_log );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>