Directives for jvm int/exit handler properties #282

xfeep · xfeep · commit 413162c1eba6 · 2023-04-16T16:27:25.000+08:00
diff --git a/src/c/ngx_http_clojure_mem.h b/src/c/ngx_http_clojure_mem.h
@@ -41,12 +41,12 @@ typedef unsigned __int64 uint64_t;
 #define JVM_CP_SEP_S ":"
 #endif
 
-#define nginx_clojure_ver  6000 /*0.6.0*/
+#define nginx_clojure_ver  6001 /*0.6.0*/
 
 /*the least jar version required*/
 #define nginx_clojure_required_rt_lver 5002
 
-#define NGINX_CLOJURE_VER_NUM_STR "0.6.0"
+#define NGINX_CLOJURE_VER_NUM_STR "0.6.1"
 
 #define NGINX_CLOJURE_VER "nginx-clojure/" NGINX_CLOJURE_VER_NUM_STR
 
@@ -90,9 +90,11 @@ typedef struct {
 	ngx_str_t jvm_init_handler_code;
 	ngx_int_t jvm_init_handler_id;
 	ngx_str_t jvm_init_handler_name;
+	ngx_array_t *jvm_init_handler_properties;
 	ngx_str_t jvm_exit_handler_code;
 	ngx_int_t jvm_exit_handler_id;
 	ngx_str_t jvm_exit_handler_name;
+	ngx_array_t *jvm_exit_handler_properties;
 	ngx_hash_t headers_out_holder_hash;
 } ngx_http_clojure_main_conf_t;
 
diff --git a/src/c/ngx_http_clojure_module.c b/src/c/ngx_http_clojure_module.c
@@ -224,6 +224,14 @@ static ngx_command_t ngx_http_clojure_commands[] = {
 		offsetof(ngx_http_clojure_main_conf_t, jvm_init_handler_code),
 		NULL
     },
+    {
+    ngx_string("jvm_init_handler_property"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE2,
+    ngx_conf_set_keyval_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(ngx_http_clojure_main_conf_t, jvm_init_handler_properties),
+    NULL
+    },
     {
 		ngx_string("jvm_exit_handler_name"),
 		NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
@@ -240,6 +248,14 @@ static ngx_command_t ngx_http_clojure_commands[] = {
 		offsetof(ngx_http_clojure_main_conf_t, jvm_exit_handler_code),
 		NULL
     },
+    {
+    ngx_string("jvm_exit_handler_property"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE2,
+    ngx_conf_set_keyval_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(ngx_http_clojure_main_conf_t, jvm_exit_handler_properties),
+    NULL
+    },
     {
 		ngx_string("handlers_lazy_init"),
 		NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
@@ -1298,13 +1314,13 @@ static ngx_int_t ngx_http_clojure_process_init(ngx_cycle_t *cycle) {
 
 	if (mcf->enable_init_handler
 			&& ngx_http_clojure_init_clojure_script(NGX_HTTP_INIT_PROCESS_PHASE, "init-process", &mcf->jvm_handler_type, &mcf->jvm_init_handler_name,
-					&mcf->jvm_init_handler_code, NULL, &mcf->jvm_init_handler_id, cycle->log) != NGX_HTTP_CLOJURE_JVM_OK) {
+					&mcf->jvm_init_handler_code, mcf->jvm_init_handler_properties, &mcf->jvm_init_handler_id, cycle->log) != NGX_HTTP_CLOJURE_JVM_OK) {
 		return NGX_ERROR;
 	}
 
 	if (mcf->enable_exit_handler
 				&& ngx_http_clojure_init_clojure_script(NGX_HTTP_EXIT_PROCESS_PHASE, "exit-process", &mcf->jvm_handler_type, &mcf->jvm_exit_handler_name,
-						&mcf->jvm_exit_handler_code, NULL, &mcf->jvm_exit_handler_id, cycle->log) != NGX_HTTP_CLOJURE_JVM_OK)  {
+						&mcf->jvm_exit_handler_code, mcf->jvm_exit_handler_properties, &mcf->jvm_exit_handler_id, cycle->log) != NGX_HTTP_CLOJURE_JVM_OK)  {
 		return NGX_ERROR;
 	}
 
