Changeset 389

Timestamp:

03/16/07 14:32:50 (1 year ago)

Author:

mikey

Message:

enhanced net.stubbles.util.stubExceptionHandler

Files:

• trunk/build/stubbles/build.xml (modified) (1 diff)
• trunk/config/errors (added)
• trunk/config/errors/500.html (added)
• trunk/src/main/php/net/stubbles/util/stubExceptionHandler.php (modified) (2 diffs)

trunk/build/stubbles/build.xml

@@ -33 +33 @@
-    <mkdir dir="${build.src.dir}/cache" />
-    <mkdir dir="${build.src.dir}/cache/xml" />
+    
+    <mkdir dir="${build.src.dir}/config/errors" />
+    <copy file="${project.basedir}/../../config/errors/500.html" tofile="${build.src.dir}/config/errors/500-dist.html" />
-    
-    <mkdir dir="${build.src.dir}/config/php" />

trunk/src/main/php/net/stubbles/util/stubExceptionHandler.php

@@ -16 +16 @@
- * @package     stubbles
- * @subpackage  util
+ * @Inject(stubRequest:stubResponse)
- */
-class stubExceptionHandler extends stubBaseObject implements stubPreInterceptor
-{
+    /**
+     * access to request instance
+     *
+     * @var  stubRequest
+     */
+    protected static $request;
+    /**
+     * access to response instance
+     *
+     * @var  stubResponse
+     */
+    protected static $response;
+    
-    /**
-     * registers the exception handler
@@ -34 +48 @@
-    public static function handle(Exception $exception)
-    {
+        if (null != self::$request) {
+            self::$request->cancel();
+        }
+        
+        if (null == self::$response) {
+            self::$response = new stubBaseResponse();
+        }
+        
-        if (stubRegistry::hasConfig('net.stubbles.mode') == true && stubRegistry::getConfig('net.stubbles.mode') == 'test') {
-            $response = new stubBaseResponse();
-            if ($exception instanceof stubException) {
-$response->write(
+self::$response->replaceData((string) 
-            } else {
-$response->write
+self::$response->replaceData
-            }
-            $response->send();
-        } else {
-            header('HTTP/1.0 500 Internal Server Error');
+            self::$response->replaceData(file_get_contents(stubConfig::getConfigPath() . '/errors/500.html'));
-        }
+        
+        // send the response because the request will end right after this 
+        // method has been finished
+        self::$response->send();
+    }
+    
+    /**
+     * sets the request instance
+     *
+     * @param  stubRequest  $request
+     */
+    public function setRequest(stubRequest $request)
+    {
+        self::$request = $request;
+    }
+    
+    /**
+     * sets the response instance
+     *
+     * @param  stubResponse  $response
+     */
+    public function setResponse(stubResponse $response)
+    {
+        self::$response = $response;
-    }
-