Merge Pull Request snabbco#502 into next

lukego · May 28, 2015 · 2edc06f · 2edc06f
2 parents f76cfde + 053bf6c
commit 2edc06f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/core/snabbswitch.c b/src/core/snabbswitch.c
@@ -14,6 +14,6 @@ int main(int snabb_argc, char **snabb_argv)
   argv = snabb_argv;
   lua_State* L = luaL_newstate();
   luaL_openlibs(L);
-  return luaL_dostring(L, "require \"core.main\"");
+  return luaL_dostring(L, "require \"core.startup\"");
 }
 
diff --git a/src/core/startup.lua b/src/core/startup.lua
@@ -0,0 +1,6 @@
+local ok, err = pcall(require, "core.main")
+if not ok then
+   print("startup: unhandled exception")
+   print(err)
+   os.exit(1)
+end