Use require to parse package.json for supervisor version

This commit is contained in:
Aleksis Brezas 2014-10-14 09:21:19 +00:00 committed by Pablo Carranza Vélez
parent 523a8b5637
commit cdca01eed1
4 changed files with 7 additions and 14 deletions

View File

@ -52,7 +52,7 @@ knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
api = require './api'
application = require './application'
supervisor = require './supervisor'
supervisor = require './supervisor-update'
console.log('Starting OpenVPN..')
openvpn = spawn('openvpn', [ 'client.conf' ], cwd: '/data')
@ -100,5 +100,5 @@ knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
# Let API know we are running a new version
application.updateDeviceInfo(
supervisor_version: supervisor.version
supervisor_version: utils.supervisorVersion
)

View File

@ -9,7 +9,6 @@ config = require './config'
csrgen = Promise.promisify require 'csr-gen'
request = Promise.promisify require 'request'
PlatformAPI = require 'resin-platform-api/request'
supervisor = require './supervisor'
PLATFORM_ENDPOINT = url.resolve(config.apiEndpoint, '/ewa/')
resinAPI = new PlatformAPI(PLATFORM_ENDPOINT)
@ -64,7 +63,7 @@ module.exports = ->
console.log('UUID:', uuid)
console.log('User ID:', userConfig.userId)
console.log('User:', userConfig.username)
console.log('Supervisor Version:', supervisor.version)
console.log('Supervisor Version:', utils.supervisorVersion)
console.log('API key:', userConfig.apiKey)
console.log('Application ID:', userConfig.applicationId)
console.log('CSR :', keys.csr)
@ -104,7 +103,7 @@ module.exports = ->
{ key: 'apiKey', value: userConfig.apiKey }
{ key: 'username', value: userConfig.username }
{ key: 'userId', value: userConfig.userId }
{ key: 'version', value: supervisor.version }
{ key: 'version', value: utils.supervisorVersion }
])
knex('app').truncate()
])

View File

@ -1,15 +1,8 @@
process.on 'uncaughtException', (e) ->
console.error('Got unhandled exception', e, e?.stack)
fs = require 'fs'
supervisor = require './supervisor-update'
# Parses package.json and returns resin-supervisor's version
supervisor.version = version = do ->
packageJson = fs.readFileSync(__dirname + '/../package.json', 'utf-8')
obj = JSON.parse packageJson
return obj.version
# Make sure the supervisor-update has initialised before we continue, as it will handle restarting to add mounts if
# necessary.
supervisor.initialised.then ->
@ -26,5 +19,3 @@ supervisor.initialised.then ->
# Wait for the DB schema to be created
knex.init.then ->
require('./app')
module.exports = exports = supervisor

View File

@ -5,6 +5,9 @@ config = require './config'
mixpanel = require 'mixpanel'
request = Promise.promisifyAll require 'request'
# Parses package.json and returns resin-supervisor's version
exports.supervisorVersion = require('../package.json').version
mixpanelClient = mixpanel.init(config.mixpanelToken)
exports.mixpanelProperties = mixpanelProperties =