首页 发现 帮助
注册 登录
PSG
/
civetweb
镜像自地址 https://github.com/civetweb/civetweb.git
5
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Improve Lua database example

bel2125 7 年之前
父节点
16c6813166
当前提交
b02dd6ed8d
共有 3 个文件被更改，包括 75 次插入 和 14 次删除
合并视图 显示文件统计
  1. 4 0
      src/mod_lua.inl
  2. 15 5
      test/page.lp
  3. 56 9
      test/page.lua

+ 4 - 0
src/mod_lua.inl
查看文件 

@@ -147,6 +147,8 @@ lua_cry(struct mg_connection *conn,
 
         const char *lua_title,
 
         const char *lua_title,
 
         const char *lua_operation)
 
         const char *lua_operation)
 
 {
 
 {
 
+	DEBUG_TRACE("lua_cry (err=%i): %s: %s", err, lua_title, lua_operation);
 
+
 
 	switch (err) {
 
 	switch (err) {
 
 	case LUA_OK:
 
 	case LUA_OK:
 
 	case LUA_YIELD:
 
 	case LUA_YIELD:
 
@@ -338,6 +340,7 @@ lsp_connect(lua_State *L)
 
 static int
 
 static int
 
 lsp_error(lua_State *L)
 
 lsp_error(lua_State *L)
 
 {
 
 {
 
+	DEBUG_TRACE("%s", "lsp_error");
 
 	lua_getglobal(L, "mg");
 
 	lua_getglobal(L, "mg");
 
 	lua_getfield(L, -1, "onerror");
 
 	lua_getfield(L, -1, "onerror");
 
 	lua_pushvalue(L, -3);
 
 	lua_pushvalue(L, -3);
 
@@ -350,6 +353,7 @@ static void
 
 lsp_abort(lua_State *L)
 
 lsp_abort(lua_State *L)
 
 {
 
 {
 
 	int top = lua_gettop(L);
 
 	int top = lua_gettop(L);
 
+	DEBUG_TRACE("%s", "lsp_abort");
 
 	lua_getglobal(L, "mg");
 
 	lua_getglobal(L, "mg");
 
 	lua_pushnil(L);
 
 	lua_pushnil(L);
 
 	lua_setfield(L, -2, "onerror");
 
 	lua_setfield(L, -2, "onerror");

+ 15 - 5
test/page.lp
查看文件 

@@ -41,18 +41,28 @@ The following features are available:
 
       timestamp NOT NULL,
 
       timestamp NOT NULL,
 
       method NOT NULL,
 
       method NOT NULL,
 
       uri NOT NULL,
 
       uri NOT NULL,
 
-      addr
 
+      addr,
 
+      civetwebversion,
 
+      luaversion,
 
+      aux
 
     );
 
     );
 
   ]])
 
   ]])
 
 
 
+  -- Add colums to table created with older version
 
+  db:exec("ALTER TABLE requests ADD COLUMN civetwebversion;")
 
+  db:exec("ALTER TABLE requests ADD COLUMN luaversion;")
 
+  db:exec("ALTER TABLE requests ADD COLUMN aux;")
 
+
 
   -- Add entry about this request
 
   -- Add entry about this request
 
   local stmt = db:prepare(
 
   local stmt = db:prepare(
 
-    'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?);');
 
+    'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?, ?, ?, ?);');
 
   stmt:bind_values(mg.request_info.request_method,
 
   stmt:bind_values(mg.request_info.request_method,
 
                    mg.request_info.uri,
 
                    mg.request_info.uri,
 
-                   mg.request_info.remote_port)
 
-  stmt:step()
 
-  stmt:finalize()
 
+                   mg.request_info.remote_port,
 
+                   mg.version,
 
+                   _VERSION,
 
+                   ""
 
+                   )
 
 
 
   -- Show all previous records
 
   -- Show all previous records
 
   mg.write('Previous requests:\n')
 
   mg.write('Previous requests:\n')

+ 56 - 9
test/page.lua
查看文件 

@@ -1,6 +1,21 @@
 
 mg.write("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n")
 
 mg.write("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n")
 
 
 
-mg.write([[<html><body>
 
+mg.write([[<html>
 
+<head>
 
+<title>Lua SQLite database test</title>
 
+<style>
 
+table, th, td {
 
+    border: 1px solid black;
 
+    border-collapse: collapse;
 
+    border-spacing: 5px;
 
+}
 
+th, td {
 
+    padding: 5px;
 
+    text-align: left;    
+}
 
+</style>
 
+</head>
 
+<body>
 
 <p>This is Lua script example 1, served by the
 
 <p>This is Lua script example 1, served by the
 
 <a href="https://github.com/civetweb/civetweb">CivetWeb web server</a>,
 
 <a href="https://github.com/civetweb/civetweb">CivetWeb web server</a>,
 
 version ]] .. mg.version .. [[.
 
 version ]] .. mg.version .. [[.
 
@@ -22,7 +37,7 @@ mg.write("</ul></p>\r\n")
 
 mg.write("<p> Today is " .. os.date("%A") .. "</p>\r\n")
 
 mg.write("<p> Today is " .. os.date("%A") .. "</p>\r\n")
 
 mg.write("<p> URI is " .. mg.request_info.uri .. "</p>\r\n")
 
 mg.write("<p> URI is " .. mg.request_info.uri .. "</p>\r\n")
 
 
 
-mg.write("<p>Database example:\r\n<pre>\r\n")
 
+mg.write("<p>\r\n<pre>\r\n")
 
 
 
   -- Open database
 
   -- Open database
 
   local db = sqlite3.open('requests.db')
 
   local db = sqlite3.open('requests.db')
 
@@ -39,33 +54,65 @@ mg.write("<p>Database example:\r\n<pre>\r\n")
 
       timestamp NOT NULL,
 
       timestamp NOT NULL,
 
       method NOT NULL,
 
       method NOT NULL,
 
       uri NOT NULL,
 
       uri NOT NULL,
 
-      addr
 
+      addr,
 
+      civetwebversion,
 
+      luaversion,
 
+      aux
 
     );
 
     );
 
   ]])
 
   ]])
 
 
 
+  -- Add colums to table created with older version
 
+  db:exec("ALTER TABLE requests ADD COLUMN civetwebversion;")
 
+  db:exec("ALTER TABLE requests ADD COLUMN luaversion;")
 
+  db:exec("ALTER TABLE requests ADD COLUMN aux;")
 
+
 
   -- Add entry about this request
 
   -- Add entry about this request
 
   local stmt = db:prepare(
 
   local stmt = db:prepare(
 
-    'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?);');
 
+    'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?, ?, ?, ?);');
 
   stmt:bind_values(mg.request_info.request_method,
 
   stmt:bind_values(mg.request_info.request_method,
 
                    mg.request_info.uri,
 
                    mg.request_info.uri,
 
-                   mg.request_info.remote_port)
 
+                   mg.request_info.remote_port,
 
+                   mg.version,
 
+                   _VERSION,
 
+                   ""
 
+                   )
 
   stmt:step()
 
   stmt:step()
 
   stmt:finalize()
 
   stmt:finalize()
 
 
 
   -- Show all previous records
 
   -- Show all previous records
 
-  mg.write('Previous requests:\n')
 
+  mg.write('<table>\n')
 
+  mg.write("<tr>\n")
 
+  mg.write("<th>id</th>\n")
 
+  mg.write("<th>timestamp</th>\n")
 
+  mg.write("<th>method</th>\n")
 
+  mg.write("<th>uri</th>\n")
 
+  mg.write("<th>addr</th>\n")
 
+  mg.write("<th>civetweb</th>\n")
 
+  mg.write("<th>lua</th>\n")
 
+  mg.write("<th>aux</th>\n")
 
+  mg.write("</tr>\n")
 
+
 
   stmt = db:prepare('SELECT * FROM requests ORDER BY id DESC;')
 
   stmt = db:prepare('SELECT * FROM requests ORDER BY id DESC;')
 
   while stmt:step() == sqlite3.ROW do
 
   while stmt:step() == sqlite3.ROW do
 
     local v = stmt:get_values()
 
     local v = stmt:get_values()
 
-    mg.write(v[1] .. ' ' .. v[2] .. ' ' .. v[3] .. ' '
 
-          .. v[4] .. ' ' .. v[5] .. '\n')
 
+    mg.write("<tr>\n")
 
+    local i = 1
 
+    while (v[i]) do
 
+      mg.write("<td>" .. v[i] .. "</td>\n")
 
+      i = i+1
 
+    end
 
+    mg.write("</tr>\n")
 
   end
 
   end
 
 
 
+  mg.write("</table>\n")
 
+
 
   -- Close database
 
   -- Close database
 
   db:close()
 
   db:close()
 
 
 
 mg.write([[
 
 mg.write([[
 
 </pre>
 
 </pre>
 
 </p>
 
 </p>
 
-</body></html>
 
+</body>
 
+</html>
 
 ]])
 
 ]])
 
+