#28 - done. Updates comments & Makefile & test;

Author: dedok

Makefile

@@ -60,6 +60,16 @@ configure-debug:
 	cp -f $(CUR_PATH)/test/ngx_confs/tnt_server_test.conf $(PREFIX_PATH)/conf/tnt_server_test.conf
 	cp -f $(CUR_PATH)/test/ngx_confs/nginx.dev.conf $(PREFIX_PATH)/conf/nginx.conf
 
+configure-for-testing:
+	cd $(NGX_PATH) && $(NGX_CONFIGURE) \
+						--with-cc-opt='$(INC_FLAGS)'\
+						--prefix=$(PREFIX_PATH) \
+						--add-module=$(MODULE_PATH)
+	mkdir -p $(PREFIX_PATH)/conf $(PREFIX_PATH)/logs
+	cp -Rf $(NGX_PATH)/conf/* $(PREFIX_PATH)/conf
+	cp -f $(CUR_PATH)/test/ngx_confs/tnt_server_test.conf $(PREFIX_PATH)/conf/tnt_server_test.conf
+	cp -f $(CUR_PATH)/test/ngx_confs/nginx.dev.conf $(PREFIX_PATH)/conf/nginx.conf
+
 configure-as-dynamic-debug:
 	cd $(NGX_PATH) && \
 		CFLAGS=" -DMY_DEBUG $(DEV_CFLAGS)" $(NGX_CONFIGURE) \

src/ngx_http_tnt_handlers.h

@@ -52,17 +52,18 @@ typedef struct {
 
     /** Preset method name
      *
-     * if method is set then tp_transcode use only this method name
+     * if method is set then tp_transcode use only this method name and
+     * ignore method name from json and uri
      */
     ngx_str_t                method;
 
-    /** Max allowed query and headers size in bytes
+    /** Max allowed size of query + headers in bytes
      */
     size_t                   pass_http_request_buffer_size;
 
     /** Pass query/headers to tarantool
      *
-     *  If set Tarantool get query args as lua table, e.g.
+     *  If this is set, then Tarantool recv. query args as lua table, e.g.
      *  /tnt_method?arg1=X&arg2=123
      *
      *  Tarantool
@@ -74,27 +75,40 @@ typedef struct {
      */
     ngx_uint_t               pass_http_request;
 
-    /** Set of http REST methods[default GET|PUT]
+    /** Http REST methods[default GET|PUT]
      *
-     * if method in http_rest_methods then tp_transcode expecting method name in
-     * url part, i.e. HOST/METHOD_NAME/TAIL?ARGS
+     * if method in http_rest_methods, then tp_transcode expecting method name
+     * in url part, i.e. HOST/METHOD_NAME/TAIL?ARGS
      *
      * XXX Also see method
      */
     ngx_uint_t               http_rest_methods;
 
     /** Set of http methods[default POST|DELETE]
      *
-     * If method in http_methods then tp_transcode expecting method name in
+     * If method in http_methods, then tp_transcode expecting method name in
      * json protocol, i.e. {"method":STR}
      *
      * XXX Also see method
      */
     ngx_uint_t               http_methods;
 
+    /** If is set to 'On', then the client will recv. pure result set, e.g.
+     * {}
+     * Otherwise
+     * {"result":[], "id": NUM}
+     */
     ngx_uint_t               pure_result;
+
+    /** Tarantool returns array of array as the result set of call,
+     * this option helps to avoid this behavior.
+     * For instance. If this option set to 2 then result will look
+     * alike result:{} instead of result:[[{}]]
+     */
     ngx_uint_t               multireturn_skip_count;
 
+    ngx_array_t                   *headers_source;
+
 } ngx_http_tnt_loc_conf_t;
 
 

src/ngx_http_tnt_module.c

@@ -33,6 +33,7 @@
 #include <ngx_config.h>
 
 #include <debug.h>
+#include <ngx_http_tnt_version.h>
 #include <ngx_http_tnt_handlers.h>
 
 
@@ -67,6 +68,7 @@ static ngx_int_t ngx_http_tnt_filter(void *data, ssize_t bytes);
 
 /** Confs
  */
+static ngx_int_t ngx_http_tnt_preconfiguration(ngx_conf_t *cf);
 static void *ngx_http_tnt_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_tnt_merge_loc_conf(
     ngx_conf_t *cf,
@@ -246,7 +248,7 @@ static ngx_command_t  ngx_http_tnt_commands[] = {
 
 
 static ngx_http_module_t  ngx_http_tnt_module_ctx = {
-    NULL,                           /* preconfiguration */
+    ngx_http_tnt_preconfiguration,  /* preconfiguration */
     NULL,                           /* postconfiguration */
 
     NULL,                           /* create main configuration */
@@ -386,6 +388,16 @@ ngx_http_tnt_filter(void *data, ssize_t bytes)
 }
 
 
+static ngx_int_t
+ngx_http_tnt_preconfiguration(ngx_conf_t *cf)
+{
+    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0,
+                    "Tarantool upstream module, version: '%s'",
+                    NGX_HTTP_TNT_MODULE_VERSION_STRING);
+    return NGX_OK;
+}
+
+
 static void *
 ngx_http_tnt_create_loc_conf(ngx_conf_t *cf)
 {

test/auto.sh

@@ -1,23 +1,40 @@
 #!/bin/bash
 
-set -e -x
+set -x -e
 
-TNT_PID=
-NGX_MASTER_PID=
+for ver_tag in `cat test/ngx_versions_list`; do
 
-tear_up()
-{
-  echo
-}
+  # Checkout nginx version via tag
+  cd nginx
+  git checkout $ver_tag
+  cd -
 
-tear_down()
-{
-  echo
-}
+  for build_type in configure-for-testing configure; do
 
-run_tests()
-{
-  echo
-}
+    # Build two configuration
+    make $build_type
+    make -j2
 
-tear_up && run_tests && tear_down
+
+    # Test debug configuration
+    if [ $build_type = "configure-for-testing" ]; then
+      echo "[+] Start testing $ver_tag"
+      ./nginx/objs/nginx 2> /dev/null &
+      nginx_pid=$!
+      tarantool test/test.lua 2> /dev/null &
+      tnt_pid=$!
+      ./test/run_all.sh
+      for pid in $nginx_pid $tnt_pid; do
+        echo "[+] Terminating $pid"
+        kill -s TERM $pid
+        wait $pid
+      done
+    fi
+
+    # Clean an old build
+    make clean
+    echo "[+] Test - OK"
+  done
+done
+
+echo "[+] All tests - OK"