diff --git a/core/utils.coffee b/core/utils.coffee index 262cc1e..be1feff 100644 --- a/core/utils.coffee +++ b/core/utils.coffee @@ -34,3 +34,8 @@ exports.randomString = (length) -> exports.hashPassword = (password, password_salt) -> return exports.sha256 password_salt + exports.sha256(password) + +exports.wrapAsync = (func) -> + return (callback) -> + func (result) -> + callback null, result diff --git a/plugin/linux/index.coffee b/plugin/linux/index.coffee index 322d898..d33d205 100644 --- a/plugin/linux/index.coffee +++ b/plugin/linux/index.coffee @@ -1,5 +1,9 @@ +_ = require 'underscore' +async = require 'async' + {pluggable, config} = app {requireAuthenticate} = app.middleware +{wrapAsync} = app.utils linux = require './linux' monitor = require './monitor' @@ -46,21 +50,10 @@ exports.registerServiceHook 'disable', app.get '/public/monitor', requireAuthenticate, (req, res) -> async.parallel - resources_usage: (callback) -> - linux.getResourceUsageByAccounts (resources_usage) -> - callback null, resources_usage - - system: (callback) -> - linux.getSystemInfo (system_info) -> - callback null, system_info - - storage: (callback) -> - linux.getStorageInfo (storage_info) -> - callback null, storage_info - - process_list: (callback) -> - linux.getProcessList (process_list) -> - callback null, process_list + resources_usage: wrapAsync linux.getResourceUsageByAccounts + system: wrapAsync linux.getSystemInfo + storage: wrapAsync linux.getStorageInfo + process_list: wrapAsync linux.getProcessList , (err, result) -> exports.render 'monitor', req, result, (html) -> diff --git a/plugin/linux/linux.coffee b/plugin/linux/linux.coffee index ef3a43c..23acc2c 100644 --- a/plugin/linux/linux.coffee +++ b/plugin/linux/linux.coffee @@ -5,6 +5,7 @@ async = require 'async' _ = require 'underscore' {cache} = app +{wrapAsync} = app.utils monitor = require './monitor' @@ -239,13 +240,8 @@ exports.getResourceUsageByAccounts = (callback) -> is_json: true , (callback) -> async.parallel - storage_quota: (callback) -> - exports.getStorageQuota (storage_quota) -> - callback null, storage_quota - - process_list: (callback) -> - exports.getProcessList (process_list) -> - callback null, process_list + storage_quota: wrapAsync exports.getStorageQuota + process_list: wrapAsync exports.getProcessList , (err, result) -> resources_usage_by_accounts = []