Skip to content

Commit c6cc34f

Browse files
committed
fix error when no stats exists for docker instance
1 parent d0cc984 commit c6cc34f

2 files changed

Lines changed: 18 additions & 12 deletions

File tree

OpenFlow/src/Messages/Message.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,6 +2417,12 @@ export class Message {
24172417
const container = docker.getContainer(item.Id);
24182418
span.addEvent("stats()");
24192419
var stats = await container.stats({ stream: false });
2420+
let cpu_usage: 0;
2421+
let memory: 0;
2422+
let memorylimit: 0;
2423+
if (stats && stats.cpu_stats && stats.cpu_stats.cpu_usage && stats.cpu_stats.cpu_usage.usage_in_usermode) cpu_usage = stats.cpu_stats.cpu_usage.usage_in_usermode;
2424+
if (stats && stats.memory_stats && stats.memory_stats.usage) memory = stats.memory_stats.usage;
2425+
if (stats && stats.memory_stats && stats.memory_stats.limit) memorylimit = stats.memory_stats.limit;
24202426
item.metrics = {
24212427
cpu: parseFloat((stats.cpu_stats.cpu_usage.usage_in_usermode / 1024 / 1024).toString()).toFixed(2) + "n",
24222428
memory: parseFloat((stats.memory_stats.usage / 1024 / 1024).toString()).toFixed(2) + "Mi",

gulpfile.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,31 +168,31 @@ gulp.task("browserify", function () {
168168

169169
gulp.task("compose", shell.task([
170170
'echo "Build openiap/openflow"',
171-
'docker build -t openiap/openflow:edge1.3 .',
172-
'docker tag openiap/openflow:edge1.3 openiap/openflow:' + version,
171+
'docker build -t openiap/openflow:edge .',
172+
'docker tag openiap/openflow:edge openiap/openflow:' + version,
173173
'echo "Push openiap/openflow"',
174-
'docker push openiap/openflow:edge1.3',
174+
'docker push openiap/openflow:edge',
175175
'docker push openiap/openflow:' + version,
176176

177177
'echo "Build openiap/nodered"',
178-
'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge1.3 .',
179-
'docker tag openiap/nodered:edge1.3 openiap/nodered:' + version,
178+
'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge .',
179+
'docker tag openiap/nodered:edge openiap/nodered:' + version,
180180
'echo "Push openiap/nodered"',
181-
'docker push openiap/nodered:edge1.3',
181+
'docker push openiap/nodered:edge',
182182
'docker push openiap/nodered:' + version,
183183

184184
// 'echo "Build openiap/nodered-puppeteer"',
185-
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered-puppeteer:edge1.3 -f Dockerfilepuppeteer .',
186-
// 'docker tag openiap/nodered-puppeteer:edge1.3 openiap/nodered-puppeteer:' + version,
185+
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered-puppeteer:edge -f Dockerfilepuppeteer .',
186+
// 'docker tag openiap/nodered-puppeteer:edge openiap/nodered-puppeteer:' + version,
187187
// 'echo "Push openiap/nodered-puppeteer"',
188-
// 'docker push openiap/nodered-puppeteer:edge1.3',
188+
// 'docker push openiap/nodered-puppeteer:edge',
189189
// 'docker push openiap/nodered-puppeteer:' + version,
190190

191191
// 'echo "Build openiap/nodered-tagui"',
192-
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered-tagui:edge1.3 -f Dockerfiletagui .',
193-
// 'docker tag openiap/nodered-tagui:edge1.3 openiap/nodered-tagui:' + version,
192+
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered-tagui:edge -f Dockerfiletagui .',
193+
// 'docker tag openiap/nodered-tagui:edge openiap/nodered-tagui:' + version,
194194
// 'echo "Push openiap/nodered-tagui"',
195-
// 'docker push openiap/nodered-tagui:edge1.3',
195+
// 'docker push openiap/nodered-tagui:edge',
196196
// 'docker push openiap/nodered-tagui:' + version,
197197

198198
]));

0 commit comments

Comments
 (0)