Changeset 2019968

Timestamp:

01/27/2019 05:45:30 PM (7 years ago)

Author:

ChrisDennis

Message:

better debugging - no functional change

File:

• media-organiser/trunk/debug.php (modified) (1 diff)

media-organiser/trunk/debug.php

@@ -4 +4 @@
 // Debug to /wp-content/debug.log (see https://codex.wordpress.org/WP_DEBUG
 // and settings in wp-config.php)
-# TODO this needs work...
-function debug (...$args) {
-    if (!WP_DEBUG) {
-        return;
+if (!function_exists(NS . 'debug')) {       
+
+    function debug (...$args) {
+        if (!WP_DEBUG) {
+            return;
+        }
+        $text = '';
+        foreach ($args as $arg) {
+            $text .= ' ' . print_r($arg, true);
+        }
+        $trace = debug_backtrace(false);
+        $file = $trace[0]['file'];
+        $p = strrpos($file, '/wp-content/');
+        if ($p !== False) {
+            $file = substr($file, $p + 12);
+        }
+        $line = $trace[0]['line'];
+        $func = $trace[1]['function'];
+        if ($func == 'include'      or
+            $func == 'include_once' or
+            $func == 'require'      or
+            $func == 'require_once'    ) {
+            $func = '';
+        } else {
+            $func = '(' . $func . ')'; 
+        }
+        error_log($file . $func . ':' . $line . $text);
     }
-    list(, $caller) = debug_backtrace(false);
-    #error_log('debug caller: ' . print_r($caller, true));
-    $function = isset($caller['function']) ? $caller['function'] : '<unknown function>';
-    $line = isset($caller['line']) ? ':'.$caller['line'] : '';
-    $text = '';
-    foreach ($args as $arg) {
-        $text .= ' ' . print_r($arg, true);
-    }
-    error_log($function . $line . $text);
+
 }