From 50ed262a8f77e46e473a6db27247c931724f40e6 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 12 Dec 2010 05:13:02 +0500 Subject: storagemanager: Fixed a nil global access. --- core/storagemanager.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'core') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 0857baf4..d3e3e807 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -25,6 +25,7 @@ function default_driver_mt:set(user, data) return olddm.store(user, self.host, s local stores_available = multitable.new(); function initialize_host(host) + local host_session = hosts[host]; host_session.events.add_handler("item-added/data-driver", function (event) local item = event.item; stores_available:set(host, item.name, item); -- cgit v1.2.3 From 980df08b94f8ba0b3cb744b3ce4287c7be303a06 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 12 Dec 2010 05:14:35 +0500 Subject: storagemanager: Hook "host-activated", to make sure we are notified about data drivers. --- core/storagemanager.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index d3e3e807..db540042 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -11,6 +11,7 @@ local log = require "util.logger".init("storagemanager"); local olddm = {}; -- maintain old datamanager, for backwards compatibility for k,v in pairs(datamanager) do olddm[k] = v; end +local prosody = prosody; module("storagemanager") @@ -36,6 +37,7 @@ function initialize_host(host) stores_available:set(host, item.name, nil); end); end +prosody.events.add_handler("host-activated", initialize_host, 101); local function load_driver(host, driver_name) if not driver_name then -- cgit v1.2.3 From 49298b499e5018526c6b95b3d81585bfe5cb710f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 12 Dec 2010 02:03:32 +0100 Subject: core.s2smanager, mod_console, mod_saslauth, util.certverification: rename util.certverification to util.x509 --- core/s2smanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 0990a0aa..2f6c8478 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -27,7 +27,7 @@ local modulemanager = require "core.modulemanager"; local st = require "stanza"; local stanza = st.stanza; local nameprep = require "util.encodings".stringprep.nameprep; -local cert_verify_identity = require "util.certverification".verify_identity; +local cert_verify_identity = require "util.x509".verify_identity; local fire_event = prosody.events.fire_event; local uuid_gen = require "util.uuid".generate; -- cgit v1.2.3 From 6771ad9d2998f4589ebacb819b89f133fb8c7970 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 12 Dec 2010 06:15:08 +0500 Subject: storagemanager: When we have a cached data driver, we are supposed to use it. --- core/storagemanager.lua | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index db540042..e0c12190 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -44,13 +44,12 @@ local function load_driver(host, driver_name) return; end local driver = stores_available:get(host, driver_name); - if not driver then - if driver_name ~= "internal" then - modulemanager.load(host, "storage_"..driver_name); - return stores_available:get(host, driver_name); - else - return setmetatable({host = host}, default_driver_mt); - end + if driver then return driver; end + if driver_name ~= "internal" then + modulemanager.load(host, "storage_"..driver_name); + return stores_available:get(host, driver_name); + else + return setmetatable({host = host}, default_driver_mt); end end -- cgit v1.2.3 From 2cbe4b74e3ff3e5588617558570288921b9a5ef8 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 15 Dec 2010 01:57:10 +0500 Subject: core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. --- core/loggingmanager.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 3cd09431..40b96d52 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -15,7 +15,7 @@ local tostring, setmetatable, rawset, pairs, ipairs, type = local io_open, io_write = io.open, io.write; local math_max, rep = math.max, string.rep; local os_date, os_getenv = os.date, os.getenv; -local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; +local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle; if os.getenv("__FLUSH_LOG") then local io_flush = io.flush; @@ -217,7 +217,7 @@ function log_sink_types.stdout() end do - local do_pretty_printing = not os_getenv("WINDIR"); + local do_pretty_printing = true; local logstyles = {}; if do_pretty_printing then @@ -244,10 +244,14 @@ do if timestamps then io_write(os_date(timestamps), " "); end + io_write(name, rep(" ", sourcewidth-namelen)); + setstyle(logstyles[level]); + io_write(level); + setstyle(); if ... then - io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n"); + io_write("\t", format(message, ...), "\n"); else - io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n"); + io_write("\t", message, "\n"); end end end -- cgit v1.2.3 From e4dcba964787f0939071e357ec9c10a980ad56e6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 17 Dec 2010 12:44:24 +0000 Subject: modulemanager, mod_console: Rename mod_console -> mod_admin_telnet - add compatibility code to modulemanager for existing configs --- core/modulemanager.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core') diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b12cddf0..8928ce14 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -77,6 +77,13 @@ function load_modules_for_host(host) end local modules = global_modules + host_modules; + -- COMPAT w/ pre 0.8 + if modules:contains("console") then + log("error", "The mod_console plugin has been renamed to mod_admin_telnet. Please update your config."); + modules:remove("console"); + modules:add("admin_telnet"); + end + if component then load(host, component); end -- cgit v1.2.3