Merge branch 'segment' of ssh://bitbucket.org/barracksiot/barracks-cl…

…i into segment
barracksiot · Feb 2, 2017 · 83991ed · 83991ed
2 parents a746174 + 381b564
commit 83991ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bin/barracks.js b/bin/barracks.js
@@ -15,7 +15,7 @@ program
   .command('devices', 'List devices')
   .command('device', 'Get device history')
   .command('segments', 'Get active and inactive segments')
-  .command('set-active-segments', 'Get active and inactive segments')
+  .command('set-active-segments', 'Set active segments in priority order')
   .parse(process.argv);
 
 process.on('SIGINT', () => {

diff --git a/renderers/jsonRenderer.js b/renderers/jsonRenderer.js
@@ -4,7 +4,7 @@ function write(content) {
 
 module.exports = promise => new Promise(resolve => {
   promise.then(result => {
-    if (result.constructor.name === 'PageableStream') {
+    if (result && result.constructor.name === 'PageableStream') {
       let firstPage = true;
       write('[');
       result.onPageReceived(page => {
@@ -17,7 +17,7 @@ module.exports = promise => new Promise(resolve => {
       result.onLastPage(() => {
         write(']');
       });
-    } else {
+    } else if (result) {
       write(JSON.stringify(result));
     }
     resolve();