Comparison

init.lua @ 255:be126fe7c4e7

Merge with MattJ & mva
author Kim Alvefur <zash@zash.se>
date Sat, 03 Dec 2011 19:46:47 +0100
parent 247:7c58c16efa3e
child 257:816b8ccb3082
child 258:94b1d9863dd9
comparison
equal deleted inserted replaced
254:616cc6a5fd30 255:be126fe7c4e7
26 max_id = max_id + 1; 26 max_id = max_id + 1;
27 t.id = tostring(max_id); 27 t.id = tostring(max_id);
28 t.logger = logger or verse.new_logger("stream"..t.id); 28 t.logger = logger or verse.new_logger("stream"..t.id);
29 t.events = events.new(); 29 t.events = events.new();
30 t.plugins = {}; 30 t.plugins = {};
31 t.verse = verse;
31 return t; 32 return t;
32 end 33 end
33 34
34 verse.add_task = require "util.timer".add_task; 35 verse.add_task = require "util.timer".add_task;
35 36
199 end 200 end
200 201
201 return conn_listener; 202 return conn_listener;
202 end 203 end
203 204
204
205 local log = require "util.logger".init("verse");
206
207 return verse; 205 return verse;