From 506329b7ce021cbdad830ffe288d6053c68668da Mon Sep 17 00:00:00 2001
From: huzhiguang <huzhiguang@jd.com>
Date: Wed, 17 Jul 2013 18:53:22 -0700
Subject: [PATCH] error_log add message_type=3 function

add f_error_log message_type=3 function
hhvm defult error_log message_type 0,so it can't support user-defind error_log mode(message_type=3)

Closes #831

Github: https://github.com/facebook/hiphop-php/pull/831
---
 hphp/runtime/ext/ext_error.cpp                | 43 ++++++++++++++-----
 hphp/test/slow/ext_error/error_log.php        | 19 ++++++++
 hphp/test/slow/ext_error/error_log.php.expect |  2 +
 3 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 hphp/test/slow/ext_error/error_log.php
 create mode 100644 hphp/test/slow/ext_error/error_log.php.expect

diff --git a/hphp/runtime/ext/ext_error.cpp b/hphp/runtime/ext/ext_error.cpp
index 656eb392c..cf3de81ce 100644
--- a/hphp/runtime/ext/ext_error.cpp
+++ b/hphp/runtime/ext/ext_error.cpp
@@ -18,6 +18,7 @@
 #include "hphp/runtime/ext/ext_error.h"
 #include "hphp/runtime/base/exceptions.h"
 #include "hphp/runtime/base/string_buffer.h"
+#include "hphp/runtime/ext/ext_file.h"
 #include "hphp/util/logger.h"
 
 namespace HPHP {
@@ -128,20 +129,40 @@ bool f_error_log(CStrRef message, int message_type /* = 0 */,
                  CStrRef destination /* = null_string */,
                  CStrRef extra_headers /* = null_string */) {
   // error_log() should not invoke the user error handler,
-  // so we use Logger::Error() instead of raise_warning()
-  std::string line(message.data(),
-                   // Truncate to 512k
-                   message.size() > (1<<19) ? (1<<19) : message.size());
+  // so we use Logger::Error() instead of raise_warning() or raise_error()
+  switch (message_type) {
+  case 0:
+  {
+    std::string line(message.data(),
+                     // Truncate to 512k
+                     message.size() > (1<<19) ? (1<<19) : message.size());
 
-  Logger::Error(line);
+    Logger::Error(line);
 
-  if (!RuntimeOption::ServerExecutionMode() &&
-      Logger::UseLogFile && Logger::Output) {
-    // otherwise errors will go to error log without displaying on screen
-    std::cerr << line;
+    if (!RuntimeOption::ServerExecutionMode() &&
+        Logger::UseLogFile && Logger::Output) {
+      // otherwise errors will go to error log without displaying on screen
+      std::cerr << line;
+    }
+    return true;
   }
-
-  return true;
+  case 3:
+  {
+    Variant outfile = f_fopen(destination, "a"); // open for append only
+    if (outfile.isNull()) {
+      Logger::Error("can't open error_log file!\n");
+      return false;
+    }
+    f_fwrite(outfile.toObject(), message);
+    f_fclose(outfile.toObject());
+    return true;
+  }
+  case 2: // not used per PHP
+  default:
+    Logger::Error("error_log does not support message_type %d!", message_type);
+    break;
+  }
+  return false;
 }
 
 int64_t f_error_reporting(CVarRef level /* = null */) {
diff --git a/hphp/test/slow/ext_error/error_log.php b/hphp/test/slow/ext_error/error_log.php
new file mode 100644
index 000000000..601684baa
--- /dev/null
+++ b/hphp/test/slow/ext_error/error_log.php
@@ -0,0 +1,19 @@
+<?php
+
+$log_string = 'hello world';
+$filename = tempnam(null, 'errorlog_test');
+
+error_log($log_string, 3, $filename);
+$f = fopen($filename, 'r');
+$content = fgets($f);
+var_dump($content);
+fclose($f);
+
+// test that the logging is appending without newlines
+error_log($log_string, 3, $filename);
+$f = fopen($filename, 'r');
+$content = fgets($f);
+var_dump($content);
+fclose($f);
+
+unlink($filename);
diff --git a/hphp/test/slow/ext_error/error_log.php.expect b/hphp/test/slow/ext_error/error_log.php.expect
new file mode 100644
index 000000000..1b6e9ccfc
--- /dev/null
+++ b/hphp/test/slow/ext_error/error_log.php.expect
@@ -0,0 +1,2 @@
+string(11) "hello world"
+string(22) "hello worldhello world"