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

Timestamp:

11/15/2016 12:26:57 AM (9 years ago)

Author:

iandunn

Message:

WordCamp Logger: Use appropriate ID seeds when calling via CLI

REMOTE_ADDR and REMOTE_PORT don't exist during requests initiated from the command line.

File:

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

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

@@ -83 +83 @@
  */
 function get_unique_request_id() {
-    return hash( 'crc32b', $_SERVER['REMOTE_ADDR'] . $_SERVER['REMOTE_PORT'] . $_SERVER['REQUEST_TIME_FLOAT'] );
+    if ( 'cli' === php_sapi_name() ) {
+        $caller = $_SERVER['USER'] . $_SERVER['SSH_CONNECTION'];
+    } else {
+        $caller = $_SERVER['REMOTE_ADDR'] . $_SERVER['REMOTE_PORT'];
+    }
+
+    return hash( 'crc32b', $caller . $_SERVER['REQUEST_TIME_FLOAT'] );
 }