Handle array/object arguments in logging calls

csmith · Jul 12, 2010 · f2195c7 · f2195c7
1 parent 5b8b227
commit f2195c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/discoverer.inc.php b/discoverer.inc.php
@@ -306,7 +306,7 @@ protected function handleRedirects($details) {
     if (strpos($m[1], '://') !== false) {
      // Fully qualified URL
      $this->claimedId = $m[1];
-     Logger::log('Redirection (full qualified) to ' . $m[1]);
+     Logger::log('Redirection (fully qualified) to ' . $m[1]);
     } else if ($m[1][0] == '/') {
      // Absolute URL
      $this->claimedId = preg_replace('#^(.*?://.*?)/.*$#', '\1', $this->claimedId) . $m[1];

diff --git a/logging.inc.php b/logging.inc.php
@@ -55,6 +55,12 @@ protected static function getCaller() {
  }
 
  protected static function formatArg(&$value, $key) {
+  if (is_array($value)) {
+   $value = '[' . implode(',', $value) . ']';
+  } else if (is_object($value)) {
+   $value = '(object: ' . get_class($value) . ')';
+  }
+
   if (strlen($value) > 30 && self::TRUNCATE_ARGS) {
    $value = substr($value, 0, 27) . '...';
   }