Changeset 4785 for sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php

Timestamp:

01/25/2017 07:13:49 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Logger: Add user and request context to log entries

File:

• sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php (modified) (3 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-logger.php

@@ -11 +11 @@
  * passing the data to this function, though.
  *
- * @todo add current username and request url to every entry, and update wp-cli command parsing regex to match
  * @todo add a $type param with 'error' and 'info' values. errors continue to go to std error log. info is logged
  *       to separate file, so they don't clutter error log. need to rotate that file. then update callers to use
@@ -22 +21 @@
     $backtrace = debug_backtrace( DEBUG_BACKTRACE_PROVIDE_OBJECT, 2 );
 
-    if ( $data && ! is_scalar( $data ) ) {
-        $data = (array) $data;
-        redact_keys( $data );
-        $data = str_replace( "\n", '[newline]', wp_json_encode( $data ) );
+    if ( 'cli' === php_sapi_name() ) {
+        $data['command'] = sprintf( '%s %s', $_SERVER['_'], implode( ' ', $_SERVER['argv'] ) );
+    } else {
+        $data['request_url'] = sprintf( '%s://%s%s', $_SERVER['REQUEST_SCHEME'], $_SERVER['SERVER_NAME'], $_SERVER['REQUEST_URI'] );
+
+        // Fall back to IP address if it's too early to detect the user
+        if ( did_action( 'after_setup_theme' ) > 0 ) {
+            $data['current_user'] = get_current_user_id();
+        } else {
+            $data['remote_ip'] = $_SERVER['REMOTE_ADDR'];
+        }
     }
+
+    redact_keys( $data );
+    $data = str_replace( "\n", '[newline]', wp_json_encode( $data ) );
 
     $log_entry = sprintf(
@@ -129 +138 @@
     foreach ( $raw_entries as $entry ) {
         $is_native_entry = 1 === preg_match( $native_entry_pattern, $entry, $entry_parts );
+        // todo bug: this should be recognized as native -- [18-Jan-2017 00:33:04 UTC] [b1955769] source-site-id-setting.php:29 - preview:post_val -- [null]
 
         if ( $is_native_entry ) {