new echo example

Author: chronolaw

http/echo/NdgEchoConf.hpp

@@ -1,12 +1,10 @@
-// Copyright (c) 2015-2017
+// Copyright (c) 2015-2018
 // Author: Chrono Law
 #ifndef _NDG_ECHO_CONF_HPP
 #define _NDG_ECHO_CONF_HPP
 
 #include "NgxAll.hpp"
 
-#define ENABLE_SCRIPT
-
 class NdgEchoConf final
 {
 public:
@@ -16,9 +14,6 @@ class NdgEchoConf final
     ~NdgEchoConf() = default;
 public:
     ngx_str_t msg;
-#ifdef ENABLE_SCRIPT
-    NgxComplexValue var;
-#endif
 public:
     static void* create(ngx_conf_t* cf)
     {
@@ -31,6 +26,6 @@ class NdgEchoConf final
     }
 };
 
-NGX_MOD_INSTANCE(NdgEchoModule, ndg_echo_module, NdgEchoConf)
+NGX_MOD_INSTANCE(NdgEchoModule, ngx_http_ndg_echo_module, NdgEchoConf)
 
 #endif  //_NDG_ECHO_CONF_HPP

http/echo/NdgEchoHandler.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2017
+// Copyright (c) 2015-2018
 // Author: Chrono Law
 #ifndef _NDG_ECHO_HANDLER_HPP
 #define _NDG_ECHO_HANDLER_HPP
@@ -14,14 +14,6 @@ class NdgEchoHandler final
     typedef NdgEchoModule  this_module;
 public:
     static ngx_int_t handler(ngx_http_request_t *r)
-    {
-        //req_line(r);
-        //req_headers(r);
-
-        return process(r);
-    }
-private:
-    static ngx_int_t process(ngx_http_request_t *r)
     try
     {
         using namespace std;
@@ -36,22 +28,16 @@ class NdgEchoHandler final
         req.body().discard();
 
         auto& cf = this_module::conf().loc(r);
-#ifdef ENABLE_SCRIPT
-        auto str = cf.var.str(r);
-        NgxString msg = str;
 
-        // warning. do not use like this
-        //NgxString msg = cf.var.str(r);
-#else
         NgxString msg = cf.msg;
-#endif
+
         // check args
         NgxString args = req->args;
 
         auto len = msg.size();
         if(!args.empty())
         {
-            len += args.size()+1;
+            len += args.size() + 1;
         }
 
         NgxResponse resp(r);
@@ -68,58 +54,13 @@ class NdgEchoHandler final
         }
 
         resp.send(msg);
-        resp.flush();
 
         return resp.eof();
     }
     catch(const NgxException& e)
     {
         return e.code();
     }
-
-    static void req_line(ngx_http_request_t *r)
-    {
-        using namespace std;
-
-        cout << r->request_line<< endl;
-        cout << r->method_name << endl;
-        cout << r->http_protocol<< endl;
-        cout << r->uri<< endl;
-        cout << r->args<< endl;
-        cout << r->exten<< endl;
-        cout << r->unparsed_uri<< endl;
-
-        //NgxBuf b(r->header_in);
-        //cout << b.boundary().len << endl;
-        NgxVarManager var(r);
-        cout << "var:";
-        //cout << var.get("request_method")<< endl;
-        cout << var["request_method"]<< endl;
-        cout << var["var1"]<< endl;
-        assert(!var["abc"].get().len);
-
-        //var.set("var1", "1234567");
-        var["var1"] = "1234567";
-        cout << var["var1"]<< endl;
-    }
-
-    static void req_headers(ngx_http_request_t *r)
-    {
-        using namespace std;
-
-        NgxRequest req(r);
-
-        auto hi = req.headers();
-
-        cout << "host = "<<hi.has("host") << endl;
-        cout << "agent= "<<hi.has("user-agent") << endl;
-
-        hi.list().visit(
-            [](ngx_table_elt_t& kv){
-                cout << kv.key << "=>"<< kv.value
-                    << ":"<<kv.hash << endl;
-            });
-    }
 };
 
 #endif  //_NDG_ECHO_HANDLER_HPP

http/echo/NdgEchoInit.hpp

@@ -9,17 +9,17 @@
 class NdgEchoInit final
 {
 public:
-    typedef NdgEchoConf conf_type;
-    typedef NdgEchoHandler handler_type;
-    typedef NdgEchoInit this_type;
+    typedef NdgEchoConf         conf_type;
+    typedef NdgEchoHandler      handler_type;
+    typedef NdgEchoInit         this_type;
 public:
     static ngx_command_t* cmds()
     {
         static ngx_command_t n[] =
         {
             {
                 ngx_string("ndg_echo"),
-                NgxTake(NGX_HTTP_LOC_CONF, 1),
+                NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
                 &this_type::set_echo,
                 NGX_HTTP_LOC_CONF_OFFSET,
                 offsetof(conf_type, msg),
@@ -63,19 +63,12 @@ class NdgEchoInit final
 private:
     static char* set_echo(ngx_conf_t* cf, ngx_command_t* cmd, void* conf)
     {
-#ifdef ENABLE_SCRIPT
-        NgxStrArray args(cf->args);
-        auto& lcf = conf_type::cast(conf);
-
-        lcf.var.init(cf, args[1]);
-#else
         auto rc = ngx_conf_set_str_slot(cf, cmd, conf);
 
         if(rc != NGX_CONF_OK)
         {
             return rc;
         }
-#endif
 
         NgxHttpCoreModule::handler(
                         cf, &handler_type::handler);

http/echo/ModNdgEcho.cpp renamed to http/echo/NdgEchoModule.cpp

@@ -3,5 +3,5 @@
 
 #include "NdgEchoInit.hpp"
 
-auto ndg_echo_module = NdgEchoInit::module();
+auto ngx_http_ndg_echo_module = NdgEchoInit::module();
 

http/echo/config

@@ -1,16 +1,16 @@
 #./configure --add-module=$HOME/ngx_cpp_dev/modules/echo
 
-ngx_addon_name=ndg_echo_module
+ngx_addon_name=ngx_http_ndg_echo_module
 
 
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP
-    ngx_module_name=ndg_echo_module
-    ngx_module_srcs="$ngx_addon_dir/ModNdgEcho.cpp"
+    ngx_module_name=ngx_http_ndg_echo_module
+    ngx_module_srcs="$ngx_addon_dir/NdgEchoModule.cpp"
 
     . auto/module
 else
-    HTTP_MODULES="$HTTP_MODULES ndg_echo_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ModNdgEcho.cpp"
+    HTTP_MODULES="$HTTP_MODULES ngx_http_ndg_echo_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/NdgEchoModule.cpp"
 fi