fixbugs

CHANGELOG.md

@@ -2,6 +2,6 @@
 
 第一个版本，用于 2014.5.18 的第一次公开测试。
 
-* 用户注册，登陆
+* 用户注册，登录
 * 订阅和退订套餐
 * SSH 插件

core/billing.coffee

@@ -27,7 +27,7 @@ exports.calcBilling = (account, isForce, callback) ->
     amount += price * billing_time
 
   unless amount
-    callback account
+    return callback account
 
   if isForce
     new_last_billing_at = new Date()

core/index.coffee

@@ -10,8 +10,9 @@ global.ObjectID = require('mongodb').ObjectID
 global.express = require 'express'
 global.async = require 'async'
 
-config = require './../config'
-i18n = require './i18n'
+global.app = express()
+global.config = require './../config'
+global.i18n = require './i18n'
 
 bindRouters = (app) ->
   app.use require 'middleware-injector'
@@ -43,8 +44,6 @@ exports.connectDatabase = (callback) ->
     callback err, db
 
 exports.runWebServer = ->
-  global.app = exports.app = express()
-
   exports.connectDatabase (err) ->
     throw err if err
 

core/view/panel.jade

@@ -28,7 +28,8 @@ block content
           header= t('panel.overview')
           p
             | #{t('plan.balance')}: #{account.attribute.balance.toFixed(2)} #{t('plan.currency.cny')}
-            | #{t('plan.remaining_time')}: #{account.attribute.remaining_time} #{t('time.day')}
+            if account.attribute.remaining_time && account.attribute.remaining_time != Infinity
+              |  |  #{t('plan.remaining_time')}: #{account.attribute.remaining_time} #{t('time.day')}
           p
             a(href= '/panel/pay/').btn.btn-success 充值
 

core/view/ticket/view.jade

@@ -34,11 +34,11 @@ block main
           button(disabled).btn.btn-lg.btn-primary 已关闭
         else
           button.btn.btn-lg.btn-primary#reply-btn(type='submit')= t('ticket.create_reply')
-          button(type='button').btn.btn-lg.btn-danger.change-status(data-status='closed')= t('ticket.close_ticket')
+          button(type='button', data-status='closed').btn.btn-lg.btn-danger.change-status= t('ticket.close_ticket')
         if mAccount.inGroup(account, 'root') && (ticket.status == 'open' || ticket.status == 'pending')
-          button(type='button').btn.btn-lg.btn-success.change-status(data-status='finish')= t('ticket.finish_ticket')
+          button(type='button', data-status='finish').btn.btn-lg.btn-success.change-status= t('ticket.finish_ticket')
         if mAccount.inGroup(account, 'root') && ticket.status == 'closed'
-          button(type='button').btn.btn-lg.btn-success.change-status(data-status='open')= t('ticket.reopen_ticket')
+          button(type='button', data-status='open').btn.btn-lg.btn-success.change-status= t('ticket.reopen_ticket')
 
 prepend sidebar
   .row

plugin/linux/monitor.coffee

@@ -13,10 +13,11 @@ last_plist = []
 passwd_cache = {}
 
 exports.run = ->
-  setInterval exports.monitoring, config.plugins.linux.monitor_cycle
+  #setInterval exports.monitoring, config.plugins.linux.monitor_cycle
 
 exports.loadpassword = (callback) ->
-  fs.readFile '/etc/password', (err, content) ->
+  fs.readFile '/etc/passwd', (err, content) ->
+    throw err if err
     content = content.toString().split '\n'
 
     passwd_cache = {}
@@ -59,14 +60,14 @@ exports.monitoring = ->
           command: result[11]
         }
 
-      async.parallel [
+      async.parallel
         cpu: (callback) ->
           exports.monitoringCpu plist, callback
 
         memory: (callback) ->
           exports.monitoringMemory plist, callback
 
-      ], (err, result) ->
+      , (err, result) ->
         app.redis.get REDIS_KEY, (err, resources_usage_list) ->
           resources_usage_list = JSON.parse resources_usage_list
           resources_usage_list.push result
@@ -123,7 +124,7 @@ exports.monitoringCpu = (plist, callback) ->
   exist_process = _.filter plist, (item) ->
     return findLastProcess item
 
-  new_process = _.fliter plist, (item) ->
+  new_process = _.filter plist, (item) ->
     return not findLastProcess item
 
   for item in exist_process