Revert "Revert "Change. Use require "resources.functions.config" to load co…"

This commit is contained in:
Alexey Melnichuk
2015-08-11 05:06:33 +03:00
parent f5d62c678f
commit 69717e31d5
69 changed files with 294 additions and 507 deletions

View File

@@ -28,12 +28,10 @@ digit_timeout = "5000";
extension = argv[1];
--include config.lua
scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
dofile(scripts_dir.."/resources/functions/config.lua");
dofile(config());
require "resources.functions.config";
--add the file_exists function
dofile(scripts_dir.."/resources/functions/file_exists.lua");
require "resources.functions.file_exists";
--connect to the database
if (file_exists(database_dir.."/core.db")) then
@@ -41,7 +39,7 @@ extension = argv[1];
dbh = freeswitch.Dbh("sqlite://"..database_dir.."/core.db");
freeswitch.consoleLog("NOTICE", "[eavesdrop] using core.db\n");
else
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('switch');
freeswitch.consoleLog("NOTICE", "[eavesdrop] using freeswitch db\n");