Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing @serverload to work on Mac/BSD. Use -o rss instead of rsz. This works on Linux/BSD/Mac with no extra per-OS logic needed.

Browse source
This commit is contained in:
Greg Taylor 2011-04-23 03:16:29 +00:00
parent 7dc4901ccc
commit ce2a8e9ffe
1 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ class CmdPy(MuxCommand):
return return
# create temporary test objects for playing with # create temporary test objects for playing with
script = create.create_script("src.scripts.scripts.DoNothing", script = create.create_script("src.scripts.scripts.DoNothing",
key = 'testscript') key='testscript')
obj = create.create_object("src.objects.objects.Object", obj = create.create_object("src.objects.objects.Object",
key='testobject') key='testobject')
conf = ServerConfig() # used to access conf values conf = ServerConfig() # used to access conf values
@ -142,7 +142,7 @@ class CmdScripts(MuxCommand):
if not scripts: if not scripts:
return "<No scripts>" return "<No scripts>"
table = [["id"], ["obj"], ["key"],["intval"],["next"],["rept"], ["db"],["typeclass"],["desc"]] table = [["id"], ["obj"], ["key"], ["intval"], ["next"], ["rept"], ["db"], ["typeclass"], ["desc"]]
for script in scripts: for script in scripts:
table[0].append(script.id) table[0].append(script.id)
@ -296,7 +296,7 @@ class CmdObjects(MuxCommand):
string += srow string += srow
string += "\n\n{wLast %s Objects created:{n" % min(nobjs, nlim) string += "\n\n{wLast %s Objects created:{n" % min(nobjs, nlim)
objs = ObjectDB.objects.all().order_by("db_date_created")[max(0, nobjs-nlim):] objs = ObjectDB.objects.all().order_by("db_date_created")[max(0, nobjs - nlim):]
table = [["Created"], ["dbref"], ["name"], ["typeclass"]] table = [["Created"], ["dbref"], ["name"], ["typeclass"]]
for i, obj in enumerate(objs): for i, obj in enumerate(objs):
@ -343,7 +343,7 @@ class CmdService(MuxCommand):
caller = self.caller caller = self.caller
switches = self.switches switches = self.switches
if switches and switches[0] not in ["list","start","stop"]: if switches and switches[0] not in ["list", "start", "stop"]:
caller.msg("Usage: @service/<start|stop|list> [service]") caller.msg("Usage: @service/<start|stop|list> [service]")
return return
@ -388,7 +388,7 @@ class CmdService(MuxCommand):
caller.msg('That service is not currently running.') caller.msg('That service is not currently running.')
return return
if service.name[:7] == 'Evennia': if service.name[:7] == 'Evennia':
string = "You seem to be shutting down a core Evennia* service. Note that" string = "You seem to be shutting down a core Evennia* service. Note that"
string += "Stopping some TCP port services will *not* disconnect users *already*" string += "Stopping some TCP port services will *not* disconnect users *already*"
string += "connected on those ports, but *may* instead cause spurious errors for them. To " string += "connected on those ports, but *may* instead cause spurious errors for them. To "
string += "safely and permanently remove ports, change settings file and restart the server." string += "safely and permanently remove ports, change settings file and restart the server."
@ -450,11 +450,11 @@ class CmdVersion(MuxCommand):
def func(self): def func(self):
"Show the version" "Show the version"
version = utils.get_evennia_version() version = utils.get_evennia_version()
string = "-"*50 +"\n\r" string = "-" * 50 + "\n\r"
string += " {cEvennia{n %s\n\r" % version string += " {cEvennia{n %s\n\r" % version
string += " (Django %s, " % (django.get_version()) string += " (Django %s, " % (django.get_version())
string += " Twisted %s)\n\r" % (twisted.version.short()) string += " Twisted %s)\n\r" % (twisted.version.short())
string += "-"*50 string += "-" * 50
self.caller.msg(string) self.caller.msg(string)
class CmdTime(MuxCommand): class CmdTime(MuxCommand):
@ -524,7 +524,7 @@ class CmdServerLoad(MuxCommand):
loadavg = os.getloadavg() loadavg = os.getloadavg()
psize = resource.getpagesize() psize = resource.getpagesize()
pid = os.getpid() pid = os.getpid()
rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rsz")).read()) / 1024.0 rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rss")).read()) / 1024.0
vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1024.0 vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1024.0
rusage = resource.getrusage(resource.RUSAGE_SELF) rusage = resource.getrusage(resource.RUSAGE_SELF)
@ -542,7 +542,7 @@ class CmdServerLoad(MuxCommand):
["%g" % loadavg[0], ["%g" % loadavg[0],
"%10d" % pid, "%10d" % pid,
"%10d " % psize, "%10d " % psize,
"%s (%gs)" % (utils.time_format(rusage.ru_utime),rusage.ru_utime), "%s (%gs)" % (utils.time_format(rusage.ru_utime), rusage.ru_utime),
#"%10d shared" % rusage.ru_ixrss, #"%10d shared" % rusage.ru_ixrss,
#"%10d pages" % rusage.ru_maxrss, #"%10d pages" % rusage.ru_maxrss,
"%10d Mb" % rmem, "%10d Mb" % rmem,
@ -554,15 +554,15 @@ class CmdServerLoad(MuxCommand):
], ],
["", "", "", ["", "", "",
"(user: %gs)" % rusage.ru_stime, "(user: %gs)" % rusage.ru_stime,
"",#"%10d private" % rusage.ru_idrss, "", #"%10d private" % rusage.ru_idrss,
"",#"%10d bytes" % (rusage.ru_maxrss * psize), "", #"%10d bytes" % (rusage.ru_maxrss * psize),
"%10d soft" % rusage.ru_minflt, "%10d soft" % rusage.ru_minflt,
"%10d writes" % rusage.ru_oublock, "%10d writes" % rusage.ru_oublock,
"%10d out" % rusage.ru_msgsnd, "%10d out" % rusage.ru_msgsnd,
"%10d forced" % rusage.ru_nivcsw "%10d forced" % rusage.ru_nivcsw
], ],
["", "", "", "", ["", "", "", "",
"",#"%10d stack" % rusage.ru_isrss, "", #"%10d stack" % rusage.ru_isrss,
"", "",
"%10d swapouts" % rusage.ru_nswap, "%10d swapouts" % rusage.ru_nswap,
"", "", "", "",