X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b79721eec298caeaedf33fbfe401c8ada1876791..984fc310e8e3b67b4359dfc4b2093daf8ccb344e:/modules/resources.py diff --git a/modules/resources.py b/modules/resources.py index abd2c35..27cc7da 100644 --- a/modules/resources.py +++ b/modules/resources.py @@ -19,8 +19,8 @@ modstop = lib.modstop # module code import resource -@lib.hook('ram', needchan=False, glevel=lib.MANAGER) -def cmd_ram(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False, glevel=lib.MANAGER) +def ram(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -31,8 +31,8 @@ def cmd_ram(bot, user, chan, realtarget, *args): bot.msg(replyto, "Memory usage (MiB): %r" % (res.ru_maxrss/1024.0)) -@lib.hook('resources', needchan=False, glevel=lib.MANAGER) -def cmd_resources(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False, glevel=lib.MANAGER) +def resources(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -42,15 +42,15 @@ def cmd_resources(bot, user, chan, realtarget, *args): res = resource.getrusage(resource.RUSAGE_SELF) bot.msg(replyto, "Resource usage:") - for i, v in [ + for i, v in ( ('utime (s)', res.ru_utime), ('stime (s)', res.ru_stime), - ('memory (MiB)', (res.ru_maxrss/1024.0)) + ('memory (MiB)', (res.ru_maxrss/1024.0)), ('I/O (blocks)', res.ru_inblock+res.ru_oublock), ('page faults', res.ru_majflt), ('signals', res.ru_nsignals), ('context switches (voluntary)', res.ru_nvcsw), ('context switches (involuntary)', res.ru_nivcsw), - ]: + ): bot.msg(replyto, "- %s: %r" % (i, v)) bot.msg(replyto, "EOL.")