Software /
code /
prosody
Comparison
core/statsmanager.lua @ 6581:f2a7ad099e01
Merge 0.10->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 24 Feb 2015 15:22:34 +0000 |
parent | 6577:1e749832ed3b |
child | 6582:71b5de1d830b |
comparison
equal
deleted
inserted
replaced
6573:afd638e9c6d0 | 6581:f2a7ad099e01 |
---|---|
46 mark_processing_done(); | 46 mark_processing_done(); |
47 return stats_interval; | 47 return stats_interval; |
48 end | 48 end |
49 | 49 |
50 timer.add_task(stats_interval, collect); | 50 timer.add_task(stats_interval, collect); |
51 prosody.events.add_handler("server-started", function () collect() end, -1); | |
51 else | 52 else |
52 log("debug", "Statistics collection is disabled"); | 53 log("debug", "Statistics collection is disabled"); |
53 -- nop | 54 -- nop |
54 function measure() | 55 function measure() |
55 return measure; | 56 return measure; |