kylefang/RootPanel
1
0
Fork 0
mirror of https://github.com/HackPlan/RootPanel.git synced 2026-01-12 22:27:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

在资源充足时不执行资源限制

Browse Source
This commit is contained in:
jysperm
2014-08-04 23:16:45 +08:00
parent 9d619da64a
commit 6dd366ecc7
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/router/public.coffee
View File

@@ -82,41 +82,7 @@ exports.get '/monitor', renderAccount, requireAuthenticate, (req, res) ->
used_per: used_per
free_per: free_per
memory: (callback) ->
fs.readFile '/proc/meminfo', (err, content) ->
mapping = {}
for line in content.toString().split('\n')
[key, value] = line.split ':'
if value
mapping[key.trim()] = parseInt (parseInt(value.trim().match(/\d+/)) / 1024).toFixed()
used = mapping['MemTotal'] - mapping['MemFree'] - mapping['Buffers'] - mapping['Cached']
used_per = (used / mapping['MemTotal'] * 100).toFixed()
cached_per = (mapping['Cached'] / mapping['MemTotal'] * 100).toFixed()
buffers_per = (mapping['Buffers'] / mapping['MemTotal'] * 100).toFixed()
free_per = 100 - used_per - cached_per - buffers_per
swap_free_per = (mapping['SwapFree'] / mapping['SwapTotal'] * 100).toFixed()
swap_used_per = 100 - swap_free_per
callback null,
used: used
cached: mapping['Cached']
buffers: mapping['Buffers']
free: mapping['MemFree']
total: mapping['MemTotal']
swap_used: mapping['SwapTotal'] - mapping['SwapFree']
swap_free: mapping['SwapFree']
swap_total: mapping['SwapTotal']
used_per: used_per
cached_per: cached_per
buffers_per: buffers_per
free_per: free_per
swap_used_per: swap_used_per
swap_free_per: swap_free_per
memory: monitor.loadMemoryInfo
, (err, result) ->
res.render 'public/monitor', _.extend result,

48
plugin/linux/monitor.coffee
View File

@@ -1,4 +1,5 @@
child_process = require 'child_process'
os = require 'os'
fs = require 'fs'
config = require '../../config.coffee'
@@ -19,6 +20,42 @@ exports.run = ->
exports.monitoring()
setInterval exports.monitoring, config.plugins.linux.monitor_cycle
exports.loadMemoryInfo = (callback) ->
fs.readFile '/proc/meminfo', (err, content) ->
mapping = {}
for line in content.toString().split('\n')
[key, value] = line.split ':'
if value
mapping[key.trim()] = parseInt (parseInt(value.trim().match(/\d+/)) / 1024).toFixed()
used = mapping['MemTotal'] - mapping['MemFree'] - mapping['Buffers'] - mapping['Cached']
used_per = (used / mapping['MemTotal'] * 100).toFixed()
cached_per = (mapping['Cached'] / mapping['MemTotal'] * 100).toFixed()
buffers_per = (mapping['Buffers'] / mapping['MemTotal'] * 100).toFixed()
free_per = 100 - used_per - cached_per - buffers_per
swap_free_per = (mapping['SwapFree'] / mapping['SwapTotal'] * 100).toFixed()
swap_used_per = 100 - swap_free_per
callback null,
used: used
cached: mapping['Cached']
buffers: mapping['Buffers']
free: mapping['MemFree']
total: mapping['MemTotal']
swap_used: mapping['SwapTotal'] - mapping['SwapFree']
swap_free: mapping['SwapFree']
swap_total: mapping['SwapTotal']
used_per: used_per
cached_per: cached_per
buffers_per: buffers_per
free_per: free_per
swap_used_per: swap_used_per
swap_free_per: swap_free_per
exports.loadPasswd = (callback) ->
app.redis.get 'rp:passwd_cache', (err, result) ->
if result
@@ -121,11 +158,14 @@ exports.monitoring = ->
unless account
return callback()
if account_usage[account_name].cpu > account.attribute.resources_limit.cpu
child_process.exec "sudo pkill -SIGKILL -u #{account_name}", ->
if os.loadavg()[0] > 1
if account_usage[account_name].cpu > account.attribute.resources_limit.cpu
child_process.exec "sudo pkill -SIGKILL -u #{account_name}", ->
if account_usage[account_name].memory > account.attribute.resources_limit.memory
child_process.exec "sudo pkill -SIGKILL -u #{account_name}", ->
exports.loadMemoryInfo (err, memory_info) ->
if account_usage[account_name].memory > account.attribute.resources_limit.memory
if memory_info.used_per > 70
child_process.exec "sudo pkill -SIGKILL -u #{account_name}", ->
callback()
, ->