a3x/transpub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'gh/moyamo/develop' into develop

Browse source
This commit is contained in:
Steffen Vogel 2016-04-06 14:42:18 +02:00
parent 22e5419cda 502077dc51
commit 417465789f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spectrum2/backend.py
View file

@ -6,6 +6,8 @@ import os
import logging import logging
import google.protobuf import google.protobuf
import resource
def WRAP(MESSAGE, TYPE): def WRAP(MESSAGE, TYPE):
wrap = protocol_pb2.WrapperMessage() wrap = protocol_pb2.WrapperMessage()
wrap.type = TYPE wrap.type = TYPE
@ -621,7 +623,7 @@ class SpectrumBackend:
pass pass
def handleMemoryUsage(self): def handleMemoryUsage(self):
return (0,0) return (resource.getrusage(resource.RUSAGE_SELF).ru_maxrss, 0)
def handleExitRequest(self): def handleExitRequest(self):
sys.exit(1) sys.exit(1)