aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-23 03:28:35 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-23 03:28:35 +0100
commita7d5181dfbb5f6b2979645ac802cd1a098282d31 (patch)
tree5295ac0bda14553f32a824755b29ee5a47517c3e /core
parent2914bea9542be6de2abfa04a9f31f383ef7adf74 (diff)
parent28ae0dd2a96bd440bc3b5d2a1b93cb908d3fea89 (diff)
downloadprosody-a7d5181dfbb5f6b2979645ac802cd1a098282d31.tar.gz
prosody-a7d5181dfbb5f6b2979645ac802cd1a098282d31.zip
Merge with 0.4 branch
Diffstat (limited to 'core')
-rw-r--r--core/loggingmanager.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 36f83861..298e4c45 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -13,6 +13,8 @@ local config = require "core.configmanager";
local logger = require "util.logger";
+_G.log = logger.init("general");
+
module "loggingmanager"
-- The log config used if none specified in the config file