Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/services/agent-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const fs = require('fs');
const formidable = require('formidable');
const logger = require('../logger');
const Sequelize = require('sequelize');
const Op = Sequelize.Op
const Op = Sequelize.Op;

const agentProvision = async function (provisionData, transaction) {

Expand Down
57 changes: 52 additions & 5 deletions src/services/iofog-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,56 @@ async function _getFog(fogData, user, isCli, transaction) {
}
await _updateFogsConnectionStatus(fog, transaction);

return fog
return {
uuid: fog.uuid,
name: fog.name,
location: fog.location,
gpsMode: fog.gpsMode,
latitude: fog.latitude,
longitude: fog.longitude,
description: fog.description,
lastActive: fog.lastActive,
daemonStatus: fog.daemonStatus,
daemonOperatingDuration: fog.daemonOperatingDuration,
daemonLastStart: fog.daemonLastStart,
memoryUsage: fog.memoryUsage,
diskUsage: fog.diskUsage,
cpuUsage: fog.cpuUsage,
memoryViolation: fog.memoryViolation,
diskViolation: fog.diskViolation,
cpuViolation: fog.cpuViolation,
catalogItemStatus: fog.catalogItemStatus,
repositoryCount: fog.repositoryCount,
repositoryStatus: fog.repositoryStatus,
systemTime: fog.systemTime,
lastStatusTime: fog.lastStatusTime,
ipAddress: fog.ipAddress,
processedMessages: fog.processedMessages,
catalogItemMessageCounts: fog.catalogItemMessageCounts,
messageSpeed: fog.messageSpeed,
lastCommandTime: fog.lastCommandTime,
networkInterface: fog.networkInterface,
dockerUrl: fog.dockerUrl,
diskLimit: fog.diskLimit,
diskDirectory: fog.diskDirectory,
memoryLimit: fog.memoryLimit,
cpuLimit: fog.cpuLimit,
logLimit: fog.logLimit,
logDirectory: fog.logDirectory,
bluetoothEnabled: fog.bluetoothEnabled,
abstractedHardwareEnabled: fog.abstractedHardwareEnabled,
logFileCount: fog.logFileCount,
version: fog.version,
isReadyToUpgrade: fog.isReadyToUpgrade,
isReadyToRollback: fog.isReadyToRollback,
statusFrequency: fog.statusFrequency,
changeFrequency: fog.changeFrequency,
deviceScanFrequency: fog.deviceScanFrequency,
tunnel: fog.tunnel,
watchdogEnabled: fog.watchdogEnabled,
fogTypeId: fog.fogTypeId,
userId: fog.userId
};
}

async function _getFogList(filters, user, isCli, transaction) {
Expand Down Expand Up @@ -286,12 +335,10 @@ async function _generateProvisioningKey(fogData, user, isCli, transaction) {
}
const provisioningKeyData = await FogProvisionKeyManager.updateOrCreate({iofogUuid: fogData.uuid}, newProvision, transaction);

const res = {
return {
key: provisioningKeyData.provisionKey,
expirationTime: provisioningKeyData.expirationTime
};

return res
}
}

async function _setFogVersionCommand(fogVersionData, user, isCli, transaction) {
Expand Down
Loading