first commit

Author: Revolyssup

src/ngx_http_apisix_log_handler.c

@@ -0,0 +1,16 @@
+#include "ngx_http_apisix_module.h"
+
+char * 
+ngx_http_apisix_error_log_request_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t *value;
+		ngx_http_apisix_loc_conf_t *loc_conf = conf;
+
+		value = cf->args->elts;
+		if (value[1].data[0] != '$') {
+				ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &value[1]);
+				return NGX_CONF_ERROR;
+		}
+
+		value[1].len--;
+}

src/ngx_http_apisix_module.c

@@ -1,9 +1,9 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
-#include <ngx_http_realip_module.h>
+#include <ngx_http_realip_module.c>
 #include "ngx_http_apisix_module.h"
-
+#include "ngx_http_apisix_log_handler.c"
 
 #define NGX_HTTP_APISIX_SSL_ENC     1
 #define NGX_HTTP_APISIX_SSL_SIGN    2
@@ -33,7 +33,13 @@ static ngx_command_t ngx_http_apisix_cmds[] = {
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_apisix_loc_conf_t, delay_client_max_body_check),
       NULL },
-
+      { ngx_string("apisix_error_log_request_id"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+        ngx_http_apisix_error_log_request_id, //TODO: Implement this setup function
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_http_apisix_loc_conf_t, request_id_var_index),
+        NULL
+      },
     ngx_null_command
 };
 
@@ -100,7 +106,7 @@ ngx_http_apisix_create_loc_conf(ngx_conf_t *cf)
     }
 
     conf->delay_client_max_body_check = NGX_CONF_UNSET;
-
+    conf->request_id_var_index = NGX_CONF_UNSET;
     return conf;
 }
 
@@ -111,6 +117,7 @@ ngx_http_apisix_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_apisix_loc_conf_t *prev = parent;
     ngx_http_apisix_loc_conf_t *conf = child;
 
+    ngx_conf_merge_value(conf->request_id_var_index, prev->request_id_var_index, NGX_CONF_UNSET);
     ngx_conf_merge_value(conf->delay_client_max_body_check,
                          prev->delay_client_max_body_check, 0);
 

src/ngx_http_apisix_module.h

@@ -7,6 +7,8 @@
 
 typedef struct {
     ngx_flag_t      delay_client_max_body_check;
+    ngx_int_t       request_id_var_index;
+
 } ngx_http_apisix_loc_conf_t;
 
 
@@ -57,5 +59,6 @@ ngx_int_t ngx_http_apisix_is_body_filter_by_lua_skipped(ngx_http_request_t *r);
 
 ngx_flag_t ngx_http_apisix_is_ntls_enabled(ngx_http_conf_ctx_t *conf_ctx);
 
+char * ngx_http_apisix_error_log_request_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
 #endif /* _NGX_HTTP_APISIX_H_INCLUDED_ */