Merge pull request #104 from starius/wt-config-optional

WServer: wt_config is optional

README.md

@@ -49,17 +49,12 @@ local code = [[
 ]]
 
 local luawt = require 'luawt'
-local test = require 'luawt.test'
-
--- File with config for server.
-local wt_config = test.baseConfig()
 
 -- Start WServer with the code above.
 local server = luawt.WServer({
     code = code,
     ip = '127.0.0.1',
     port = 8080,
-    wt_config = wt_config,
 })
 server:start()
 server:waitForShutdown()

examples/hello/main.lua

@@ -1,13 +1,13 @@
-local test = require 'luawt.test'
+local luawt = require 'luawt'
 
 local module_file = io.open('./examples/hello/hello.lua', 'r')
 local code = module_file:read('*all')
 module_file:close()
 
-local ip = '0.0.0.0'
-local port = 12346
-local wt_config = test.baseConfig()
-local server = test.createServer(code, ip, port, wt_config)
-
+local server = luawt.WServer({
+    code = code,
+    ip = '0.0.0.0',
+    port = 12346,
+})
 server:start()
 server:waitForShutdown()

examples/luacheck/main.lua

@@ -1,4 +1,4 @@
-local test = require 'luawt.test'
+local luawt = require 'luawt'
 
 local code = [[
     local app, env = ...
@@ -23,10 +23,10 @@ local code = [[
     end)
 ]]
 
-local ip = '0.0.0.0'
-local port = 12345
-local wt_config = test.baseConfig()
-local server = test.createServer(code, ip, port, wt_config)
-
+local server = luawt.WServer({
+    code = code,
+    ip = '0.0.0.0',
+    port = 12345,
+})
 server:start()
 server:waitForShutdown()

src/luawt/WServer.cpp

@@ -58,8 +58,11 @@ int luawt_WServer_make(lua_State* L) {
     lua_getfield(L, 1, "port");
     const char* port = luaL_checkstring(L, -1);
     // get config
+    const char* config = 0;
     lua_getfield(L, 1, "wt_config");
-    const char* config = luaL_checkstring(L, -1);
+    if (!lua_isnil(L, -1)) {
+        config = luaL_checkstring(L, -1);
+    }
     // make argc, argv
     typedef std::vector<const char*> Options;
     Options opt;
@@ -69,8 +72,10 @@ int luawt_WServer_make(lua_State* L) {
     opt.push_back("--http-port");
     opt.push_back(port);
     opt.push_back("--docroot=/usr/share/Wt");
-    opt.push_back("--config");
-    opt.push_back(config);
+    if (config) {
+        opt.push_back("--config");
+        opt.push_back(config);
+    }
     opt.push_back(0);
     WServer* server = reinterpret_cast<WServer*>(
         lua_newuserdata(L, sizeof(WServer))