优化异常处理;

Author: sasou2008

demo/public/cli.php

@@ -8,10 +8,14 @@
     exit('This script is run as CLI with no path?');
 }
 
+function doException($e) {
+    echo $e->getMessage();
+}
+
 $app = \Gene\Application::getInstance();
 $app
     ->autoload(APP_ROOT)
     ->load("router.ini.php")
     ->load("config.ini.php")
-    ->setMode(1, 1)
+    ->setMode(1, 1, "doException")
     ->run('get', $path);

src/app/application.c

@@ -458,7 +458,7 @@ PHP_METHOD(gene_application, autoload) {
 PHP_METHOD(gene_application, error) {
 	zval *callback = NULL, *error_type = NULL, *self = getThis();
 	long type = 0;
-	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "lzz", &type, &callback, &error_type) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "l|zz", &type, &callback, &error_type) == FAILURE) {
 		return;
 	}
 	if (type > 0) {
@@ -473,7 +473,7 @@ PHP_METHOD(gene_application, error) {
 PHP_METHOD(gene_application, exception) {
 	zval *callback = NULL, *error_type = NULL, *self = getThis();
 	long type = 0;
-	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "lz", &type, &callback) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "l|z", &type, &callback) == FAILURE) {
 		return;
 	}
 	if (type > 0) {
@@ -489,14 +489,15 @@ PHP_METHOD(gene_application, exception) {
 PHP_METHOD(gene_application, setMode) {
 	zval *self = getThis();
 	long error_type = 0, exception_type = 0;
-	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "|ll", &error_type, &exception_type) == FAILURE) {
+	zval *error_callback = NULL, *ex_callback = NULL;
+	if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "|llzz", &error_type, &exception_type, &ex_callback, &error_callback) == FAILURE) {
 		return;
 	}
 	if (error_type > 0) {
-		gene_exception_error_register(NULL, NULL TSRMLS_CC);
+		gene_exception_error_register(error_callback, NULL TSRMLS_CC);
 	}
 	if (exception_type > 0) {
-		gene_exception_register(NULL TSRMLS_CC);
+		gene_exception_register(ex_callback TSRMLS_CC);
 	}
 	RETURN_ZVAL(self, 1, 0);
 }

src/cache/memcached.c

@@ -378,7 +378,7 @@ PHP_METHOD(gene_memcached, set)
 	if (object) {
 		if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
 			serializer_handler = zend_read_property(gene_memcached_ce, self, ZEND_STRL(GENE_MEM_SERIALIZE), 1, NULL);
-			if(serializer_handler) {
+			if(serializer_handler && Z_LVAL_P(serializer_handler) > 0) {
 				zval ret_string;
 				if (serialize(value, &ret_string, serializer_handler)) {
 					#ifdef PHP_WIN32
@@ -387,17 +387,17 @@ PHP_METHOD(gene_memcached, set)
 						gene_memcached_set (object, key, &ret_string, ttl, return_value);
 					#endif
 					zval_ptr_dtor(&ret_string);
+					return;
 				}
-				return;
 			}
-		} else {
-			#ifdef PHP_WIN32
-				gene_memcache_set (object, key, value, ttl, flag, return_value);
-			#else
-				gene_memcached_set (object, key, value, ttl, return_value);
-			#endif
-			return;
 		}
+
+		#ifdef PHP_WIN32
+			gene_memcache_set (object, key, value, ttl, flag, return_value);
+		#else
+			gene_memcached_set (object, key, value, ttl, return_value);
+		#endif
+		return;
 	}
 	RETURN_NULL();
 }

src/cache/redis.c

@@ -297,7 +297,7 @@ PHP_METHOD(gene_redis, set) {
 	if (object) {
 		if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
 			serializer_handler = zend_read_property(gene_redis_ce, self, ZEND_STRL(GENE_REDIS_SERIALIZE), 1, NULL);
-			if (serializer_handler) {
+			if (serializer_handler && Z_LVAL_P(serializer_handler) > 0) {
 				zval ret_string;
 				if (serialize(value, &ret_string, serializer_handler) > 0) {
 					redis_set(object, key, ttl, &ret_string, return_value);
@@ -309,13 +309,20 @@ PHP_METHOD(gene_redis, set) {
 						}
 					}
 					zval_ptr_dtor(&ret_string);
+					return;
 				}
-				return;
 			}
-		} else {
-			redis_set(object, key, ttl, value, return_value);
-			return;
 		}
+
+		redis_set(object, key, ttl, value, return_value);
+		if (EG(exception)) {
+			if (checkError(EG(exception))) {
+				EG(exception) = NULL;
+				initRObj (self, NULL);
+				redis_set(object, key, ttl, value, return_value);
+			}
+		}
+		return;
 	}
 	RETURN_NULL();
 }
@@ -369,7 +376,7 @@ GENE_MINIT_FUNCTION(redis)
 
     zend_declare_property_null(gene_redis_ce, ZEND_STRL(GENE_REDIS_CONFIG), ZEND_ACC_PUBLIC TSRMLS_CC);
 	zend_declare_property_null(gene_redis_ce, ZEND_STRL(GENE_REDIS_OBJ), ZEND_ACC_PUBLIC TSRMLS_CC);
-	zend_declare_property_long(gene_redis_ce, ZEND_STRL(GENE_REDIS_SERIALIZE), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_long(gene_redis_ce, ZEND_STRL(GENE_REDIS_SERIALIZE), 1, ZEND_ACC_PUBLIC TSRMLS_CC);
     //
 	return SUCCESS; // @suppress("Symbol is not resolved")
 }