prosody
6a184b16b717

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

6165:6a184b16b717

core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from util.paths
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2014 19:35:29 +0200
parents 6164:ef4024f6bc40
children 6167:5af7fe1014db
files core/certmanager.lua core/moduleapi.lua plugins/mod_storage_sql.lua plugins/mod_storage_sql2.lua
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/core/certmanager.lua	Fri May 09 19:34:35 2014 +0200
+++ b/core/certmanager.lua	Fri May 09 19:35:29 2014 +0200
@@ -19,7 +19,7 @@
 local t_insert = table.insert;
 
 local prosody = prosody;
-local resolve_path = configmanager.resolve_relative_path;
+local resolve_path = require"util.paths".resolve_relative_path;
 local config_path = prosody.paths.config;
 
 local luasec_has_noticket, luasec_has_verifyext, luasec_has_no_compression;
--- a/core/moduleapi.lua	Fri May 09 19:34:35 2014 +0200
+++ b/core/moduleapi.lua	Fri May 09 19:35:29 2014 +0200
@@ -13,6 +13,7 @@
 local logger = require "util.logger";
 local pluginloader = require "util.pluginloader";
 local timer = require "util.timer";
+local resolve_relative_path = require"util.paths".resolve_relative_path;
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
@@ -360,7 +361,7 @@
 end
 
 function api:load_resource(path, mode)
-	path = config.resolve_relative_path(self:get_directory(), path);
+	path = resolve_relative_path(self:get_directory(), path);
 	return io.open(path, mode);
 end
 
--- a/plugins/mod_storage_sql.lua	Fri May 09 19:34:35 2014 +0200
+++ b/plugins/mod_storage_sql.lua	Fri May 09 19:35:29 2014 +0200
@@ -49,7 +49,7 @@
 end
 
 
-local resolve_relative_path = require "core.configmanager".resolve_relative_path;
+local resolve_relative_path = require "util.paths".resolve_relative_path;
 
 local function test_connection()
 	if not connection then return nil; end
--- a/plugins/mod_storage_sql2.lua	Fri May 09 19:34:35 2014 +0200
+++ b/plugins/mod_storage_sql2.lua	Fri May 09 19:35:29 2014 +0200
@@ -2,7 +2,7 @@
 local json = require "util.json";
 local xml_parse = require "util.xml".parse;
 local uuid = require "util.uuid";
-local resolve_relative_path = require "core.configmanager".resolve_relative_path;
+local resolve_relative_path = require "util.paths".resolve_relative_path;
 
 local stanza_mt = require"util.stanza".stanza_mt;
 local getmetatable = getmetatable;