prosody
6728ad041761
plugins/mod_uptime.lua

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

Software / code / prosody

Annotate

plugins/mod_uptime.lua @ 6745:6728ad041761

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parent 5776:bd0ff8ae98a8
child 8344:071c0523c4cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1523
841d61be198f Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents: 1495
diff changeset
1 -- Prosody IM
2923
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2017
diff changeset
2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2017
diff changeset
3 -- Copyright (C) 2008-2010 Waqas Hussain
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 4345
diff changeset
4 --
758
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
6 -- COPYING file in the source package for more information.
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 438
diff changeset
7 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 438
diff changeset
8
2016
5d47cfa4b2a0 mod_uptime: Removed unused variables.
Waqas Hussain <waqas20@gmail.com>
parents: 2015
diff changeset
9 local st = require "util.stanza";
1494
bdfa5274e111 mod_uptime: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
10
1495
6c745a108e68 mod_uptime: Use time of server start rather than module load
Matthew Wild <mwild1@gmail.com>
parents: 1494
diff changeset
11 local start_time = prosody.start_time;
4345
f6d694b1cdb3 mod_uptime: Use module:hook_global()
Matthew Wild <mwild1@gmail.com>
parents: 3540
diff changeset
12 module:hook_global("server-started", function() start_time = prosody.start_time end);
1524
a89fec6d76d2 mod_uptime: Fix bad uptime if module is loaded at startup
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
13
3232
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
14 -- XEP-0012: Last activity
1494
bdfa5274e111 mod_uptime: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
15 module:add_feature("jabber:iq:last");
bdfa5274e111 mod_uptime: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
16
2015
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
17 module:hook("iq/host/jabber:iq:last:query", function(event)
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
18 local origin, stanza = event.origin, event.stanza;
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
19 if stanza.attr.type == "get" then
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
20 origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
21 return true;
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
22 end
2140c994671e mod_uptime: Updated to use events (which also fixes a few minor issues).
Waqas Hussain <waqas20@gmail.com>
parents: 1524
diff changeset
23 end);
3232
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
24
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
25 -- Ad-hoc command
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
26 local adhoc_new = module:require "adhoc".new;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
27
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
28 function uptime_text()
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
29 local t = os.time()-prosody.start_time;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
30 local seconds = t%60;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
31 t = (t - seconds)/60;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
32 local minutes = t%60;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
33 t = (t - minutes)/60;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
34 local hours = t%24;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
35 t = (t - hours)/24;
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
36 local days = t;
3540
bc139431830b Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents: 3232
diff changeset
37 return string.format("This server has been running for %d day%s, %d hour%s and %d minute%s (since %s)",
bc139431830b Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents: 3232
diff changeset
38 days, (days ~= 1 and "s") or "", hours, (hours ~= 1 and "s") or "",
3232
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
39 minutes, (minutes ~= 1 and "s") or "", os.date("%c", prosody.start_time));
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
40 end
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
41
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
42 function uptime_command_handler (self, data, state)
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
43 return { info = uptime_text(), status = "completed" };
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
44 end
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
45
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
46 local descriptor = adhoc_new("Get uptime", "uptime", uptime_command_handler);
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
47
c47bfd62701c mod_uptime: Add ad-hoc command
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
48 module:add_item ("adhoc", descriptor);