Changeset 18538 for branches/comu-ver2/data/class/SC_DbConn.php

Timestamp:

2010/02/02 19:20:24 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18526

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/app_initial.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Fapp_initial.php
data/class/SC_DbConn.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_DbConn.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/require_base.php 17578@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Frequire_base.php
data/require_classes.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_classes.php
data/require_safe.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_safe.php
html/admin/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fadmin%2Frequire.php
html/error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Ferror.php
html/handle_error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Fhandle_error.php
html/mobile/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fmobile%2Frequire.php
html/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Frequire.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2152

bzr:revprop:branch-nick:

branches/comu-ver2

bzr:root:

branches/comu-ver2

bzr:text-parents:

data/class/SC_DbConn.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18487
data/install.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18234
data/require_base.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18370
html/admin/require.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18360
html/mobile/require.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18360
html/require.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18318

bzr:timestamp:

2010-02-02 19:20:20.867000103 +0900

bzr:user-agent:

bzr2.0.4+bzr-svn1.0.1

svn:original-date:

2010-02-02T10:20:20.867000Z

Message:

merged r18500

• エラーハンドリングの変更(#573, #567)
  • data/require_base.php で行っていた処理を data/app_initial.php, data/require_classes.php に分散
  • アプリケーション初期化時に, DBアクセスを伴わない data/require_safe.php を追加
  • システムエラー表示用の html/error.php を追加
  • エラーハンドリング処理を行う html/handle_error.php を追加
  • data/class/SC_DbConn.php でのエラーハンドリングを trigger_error に変更
  • エラーハンドリングの変更に伴い, html/require.php, html/mobile/require.php, html/admin/require.php を修正

File:

• branches/comu-ver2/data/class/SC_DbConn.php (modified) (2 diffs)

branches/comu-ver2/data/class/SC_DbConn.php

@@ -221 +221 @@
 
     function send_err_mail($pearResult, $sql){
-        require_once(CLASS_EX_PATH . "page_extends/error/LC_Page_Error_SystemError_Ex.php");
-        
-        $objPage = new LC_Page_Error_SystemError_Ex();
-        register_shutdown_function(array($objPage, "destroy"));
-        $objPage->init();
-        $objPage->addDebugMsg($sql);
-        $objPage->pearResult = $pearResult;
-        GC_Utils_Ex::gfPrintLog($objPage->sfGetErrMsg());
-        $objPage->process();
-        
+
+        $errmsg = $sql . "\n\n";
+
+        // PEAR エラーを伴う場合
+        if (!is_null($pearResult)) {
+            $errmsg .= $pearResult->message . "\n\n";
+            $errmsg .= $pearResult->userinfo . "\n\n";
+            $errmsg .= SC_Utils_Ex::sfBacktraceToString($pearResult->backtrace);
+        }
+        // (上に該当せず)バックトレースを生成できる環境(一般的には PHP 4 >= 4.3.0, PHP 5)の場合
+        else if (function_exists("debug_backtrace")) {
+            $errmsg .= SC_Utils_Ex::sfBacktraceToString(array_slice(debug_backtrace(), 2));
+        }
+
+        GC_Utils_Ex::gfPrintLog($errmsg);
+        trigger_error($errmsg, E_USER_ERROR);
         exit();
     }
@@ -248 +254 @@
     }
 }
-
 ?>