Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-27 02:06:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some cleanup of the server command.

Browse source
This commit is contained in:
Griatch 2014-05-11 19:03:45 +02:00
parent 9bfb829274
commit f3af089aac
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/default/system.py
View file

@ -620,7 +620,10 @@ class CmdServerLoad(MuxCommand):
show server load and memory statistics
Usage:
@serverload
@serverload[/mem]
Switch:
mem - return only a string of the current memory usage
This command shows server load statistics and dynamic memory
usage.
@ -675,6 +678,10 @@ class CmdServerLoad(MuxCommand):
pmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "%mem")).read()) # percent of resident memory to total
rusage = resource.getrusage(resource.RUSAGE_SELF)
if "mem" in self.switches:
caller.msg("Memory usage: RMEM: {w%g{n MB (%g%%), VMEM (res+swap+cache): {w%g{n MB." % (rmem, pmem, vmem))
return
# load table
loadtable = prettytable.PrettyTable(["property", "statistic"])
loadtable.align = 'l'
@ -715,10 +722,11 @@ class CmdServerLoad(MuxCommand):
# get sizes of other caches
attr_cache_info, prop_cache_info = get_cache_sizes()
string += "\n{w Entity idmapper cache usage:{n %5.2f MB (%i items)\n%s" % (totcache[1], totcache[0], memtable)
string += "\n{w On-entity Attribute cache usage:{n %5.2f MB (%i attrs)" % (attr_cache_info[1], attr_cache_info[0])
string += "\n{w On-entity Property cache usage:{n %5.2f MB (%i props)" % (prop_cache_info[1], prop_cache_info[0])
#string += "\n{w On-entity Attribute cache usage:{n %5.2f MB (%i attrs)" % (attr_cache_info[1], attr_cache_info[0])
#string += "\n{w On-entity Property cache usage:{n %5.2f MB (%i props)" % (prop_cache_info[1], prop_cache_info[0])
base_mem = vmem - totcache[1] - attr_cache_info[1] - prop_cache_info[1]
string += "\n{w Base Server usage (virtmem-idmapper-attrcache-propcache):{n %5.2f MB" % base_mem
#string += "\n{w Base Server usage (virtmem-idmapper-attrcache-propcache):{n %5.2f MB" % base_mem
string += "\n{w Base Server usage (virtmem - cache):{n %5.2f MB" % base_mem
caller.msg(string)

4
src/server/models.py
View file

@ -14,7 +14,7 @@ except ImportError:
import pickle
from django.db import models
from src.utils.idmapper.models import SharedMemoryModel
from src.utils.idmapper.models import WeakSharedMemoryModel
from src.utils import logger, utils
from src.server.manager import ServerConfigManager
@ -25,7 +25,7 @@ from src.server.manager import ServerConfigManager
#
#------------------------------------------------------------
class ServerConfig(SharedMemoryModel):
class ServerConfig(WeakSharedMemoryModel):
"""
On-the fly storage of global settings.