Skip to content

A
AppMonitorSubscriber
Commit 1208c754 by trace
Options

fix issue: onlineDuration of undefine

parent 4d27a683
Showing with 6 additions and 8 deletions
play.js
let version = '1.3' let version = '1.3.1'
let release = `<div><br/> let release = `<div><br/>
<br/>1. <br/> <br/>1. <br/>
添加"上", "下", 单独搜索客户 id 加上上下标识, 如: "上2002"<br/> fix issue <br/>
<br/>2. <br/>
添加在线时长统计. 详见 "在线/下线 情况"<br/>
<div/> <div/>
<br/> <br/>
<br/> <br/>
...@@ -240,7 +238,7 @@ function generateDailyOnlineReport() { ...@@ -240,7 +238,7 @@ function generateDailyOnlineReport() {
let daichaoOfflines = daichaoApps.filter(val => !daichaoOnlines.includes(val)) let daichaoOfflines = daichaoApps.filter(val => !daichaoOnlines.includes(val))
let content = '' let content = ''
let calTime = (val) => { let calTime = (val) => {
return `<br/>在线: ${status[val].onlineDuration} | 下线: ${status[val].offlineDuration}` return `<br/>在线: ${status[val] && status[val].onlineDuration || ""} | 下线: ${status[val] && status[val].offlineDuration || ""}`
} }
content += wrapSummary(`Gitlab 在线 app (${onlineApps.length}/${ourAppIds.length})`, onlineApps.map(val => link(val) + calTime(val)), 'green') content += wrapSummary(`Gitlab 在线 app (${onlineApps.length}/${ourAppIds.length})`, onlineApps.map(val => link(val) + calTime(val)), 'green')
content += '在线时长情况:' content += '在线时长情况:'
...@@ -660,7 +658,7 @@ function genMail() { ...@@ -660,7 +658,7 @@ function genMail() {
newOffline.forEach(name => { newOffline.forEach(name => {
let his = (status[name] && status[name].permissionHis && status[name].permissionHis) || {} let his = (status[name] && status[name].permissionHis && status[name].permissionHis) || {}
his.lastPermissions = (status[name] && status[name].permissions && status[name].permissions) || [] his.lastPermissions = (status[name] && status[name].permissions && status[name].permissions) || []
emailContent += getPermissionChangeContent(name, his, `新下架ಥ_ಥ(及上次权限情况)[上次在线持续: ${status[name].onlineDuration || 0}]`, '下') emailContent += getPermissionChangeContent(name, his, `新下架ಥ_ಥ(及上次权限情况)[上次在线持续: ${status[name] && status[name].onlineDuration || ""}]`, '下')
// emailContent += `<div>检测到新下架ಥ_ಥ: ${link(name)}</div>` // emailContent += `<div>检测到新下架ಥ_ಥ: ${link(name)}</div>`
}) })
emailContent += `<br/>/>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^<br/>` emailContent += `<br/>/>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^<br/>`
...@@ -1023,7 +1021,7 @@ function rankOnlineTime(apps) { ...@@ -1023,7 +1021,7 @@ function rankOnlineTime(apps) {
let day5Down = [] let day5Down = []
let day1 = [] let day1 = []
for (id of onlineApps) { for (id of onlineApps) {
let duration = status[id].onlineDuration || '0 小时' let duration = status[id] && status[id].onlineDuration || '0 小时'
durations = duration.split(' ') durations = duration.split(' ')
duration = durations[0] duration = durations[0]
let unit = durations[1] let unit = durations[1]
...@@ -1052,7 +1050,7 @@ function rankOnlineTime(apps) { ...@@ -1052,7 +1050,7 @@ function rankOnlineTime(apps) {
day1 = day1.sort(sortFoo).map(val => val.id) day1 = day1.sort(sortFoo).map(val => val.id)
let calTime = (val) => { let calTime = (val) => {
return `<br/>在线时长: ${status[val].onlineDuration} | 下线时长: ${status[val].offlineDuration}` return `<br/>在线时长: ${status[val] && status[val].onlineDuration || 0} | 下线时长: ${status[val] && status[val].offlineDuration || 0}`
} }
let content = '' let content = ''
content += wrapSummary(`30天及以上app (${day30Up.length}/${ourAppIds.length})`, day30Up.map(val => link(val) + calTime(val)), 'green') content += wrapSummary(`30天及以上app (${day30Up.length}/${ourAppIds.length})`, day30Up.map(val => link(val) + calTime(val)), 'green')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment