X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4477123de1254afa80243f7f9eab62c5cbf7b786..c3ff1486929923f394c219e6999df301a5a5bf04:/modules/resources.py

diff --git a/modules/resources.py b/modules/resources.py
index 606bdc7..35136a8 100644
--- a/modules/resources.py
+++ b/modules/resources.py
@@ -19,7 +19,7 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import resource
+import resource, time
 
 @lib.hook(needchan=False, wantchan=True, glevel=lib.MANAGER)
 @lib.help(None, "show RAM usage")
@@ -40,6 +40,10 @@ def resources(bot, user, chan, realtarget, *args):
 	if chan is not None: replyto = chan
 	else: replyto = user
 
+	uptime = time.time() - bot.parent.starttime
+	m, s = divmod(uptime, 60)
+	h, m = divmod(m, 60)
+	d, h = divmod(h, 24)
 	try:
 		res = resource.getrusage(resource.RUSAGE_BOTH)
 	except:
@@ -47,6 +51,7 @@ def resources(bot, user, chan, realtarget, *args):
 
 	bot.slowmsg(replyto, "Resource usage:")
 	for i, v in (
+		('uptime (s)', "%d (%d days %02d:%02d:%02d)" % (uptime, d, h, m, s)),
 		('utime (s)', res.ru_utime),
 		('stime (s)', res.ru_stime),
 		('memory (MiB)', (res.ru_maxrss/1024.0)),
@@ -56,5 +61,5 @@ def resources(bot, user, chan, realtarget, *args):
 		('context switches (voluntary)', res.ru_nvcsw),
 		('context switches (involuntary)', res.ru_nivcsw),
 	):
-		bot.slowmsg(replyto, "- %s: %r" % (i, v))
+		bot.slowmsg(replyto, "- %s: %s" % (i, v))
 	bot.slowmsg(replyto, "EOL.")