ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of systemd errors when polling for log to display

Browse Source 
Change-type: patch
Closes: #610
Signed-off-by: Cameron Diver <cameron@resin.io>
This commit is contained in:
Cameron Diver 2018-04-02 10:50:23 +01:00
parent 6229e3ee61
commit 96d7bbefd0
No known key found for this signature in database
GPG Key ID: 69264F9C923F55C1
2 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/device-config.coffee
View File

@ -34,7 +34,6 @@ forbiddenConfigKeys = [
]
arrayConfigKeys = [ 'dtparam', 'dtoverlay', 'device_tree_param', 'device_tree_overlay' ]
logToDisplayServiceName = 'resin-info@tty1'
vpnServiceName = 'openvpn-resin'
module.exports = class DeviceConfig
@ -53,7 +52,7 @@ module.exports = class DeviceConfig
lockOverride: { envVarName: 'RESIN_SUPERVISOR_OVERRIDE_LOCK', varType: 'bool', defaultValue: 'false' }
nativeLogger: { envVarName: 'RESIN_SUPERVISOR_NATIVE_LOGGER', varType: 'bool', defaultValue: 'true' }
}
@validKeys = [ 'RESIN_HOST_LOG_TO_DISPLAY', 'RESIN_SUPERVISOR_VPN_CONTROL', 'RESIN_OVERRIDE_LOCK' ].concat(_.map(@configKeys, 'envVarName'))
@validKeys = [ 'RESIN_SUPERVISOR_VPN_CONTROL', 'RESIN_OVERRIDE_LOCK' ].concat(_.map(@configKeys, 'envVarName'))
@actionExecutors = {
changeConfig: (step) =>
@logger.logConfigChange(step.humanReadableTarget)
@ -62,14 +61,6 @@ module.exports = class DeviceConfig
@logger.logConfigChange(step.humanReadableTarget, { success: true })
.tapCatch (err) =>
@logger.logConfigChange(step.humanReadableTarget, { err })
setLogToDisplay: (step) =>
logValue = { RESIN_HOST_LOG_TO_DISPLAY: step.target }
@logger.logConfigChange(logValue)
@setLogToDisplay(step.target)
.then =>
@logger.logConfigChange(logValue, { success: true })
.tapCatch (err) =>
@logger.logConfigChange(logValue, { err })
setVPNEnabled: (step, { initial = false } = {}) =>
logValue = { RESIN_SUPERVISOR_VPN_CONTROL: step.target }
if !initial
@ -104,7 +95,6 @@ module.exports = class DeviceConfig
return JSON.parse(devConfig.targetValues)
.then (conf) =>
conf = @filterConfigKeys(conf)
conf.RESIN_HOST_LOG_TO_DISPLAY ?= ''
if initial or !conf.RESIN_SUPERVISOR_VPN_CONTROL?
conf.RESIN_SUPERVISOR_VPN_CONTROL = 'true'
for own k, { envVarName, defaultValue } of @configKeys
@ -115,12 +105,10 @@ module.exports = class DeviceConfig
@config.getMany([ 'deviceType' ].concat(_.keys(@configKeys)))
.then (conf) =>
Promise.join(
@getLogToDisplay()
@getVPNEnabled()
@getBootConfig(conf.deviceType)
(logToDisplayStatus, vpnStatus, bootConfig) =>
(vpnStatus, bootConfig) =>
currentConf = {
RESIN_HOST_LOG_TO_DISPLAY: (logToDisplayStatus ? '').toString()
RESIN_SUPERVISOR_VPN_CONTROL: (vpnStatus ? 'true').toString()
}
for own key, { envVarName } of @configKeys
@ -131,7 +119,6 @@ module.exports = class DeviceConfig
getDefaults: =>
Promise.try =>
return _.extend({
RESIN_HOST_LOG_TO_DISPLAY: ''
RESIN_SUPERVISOR_VPN_CONTROL: 'true'
}, _.mapValues(_.mapKeys(@configKeys, 'envVarName'), 'defaultValue'))
@ -175,12 +162,6 @@ module.exports = class DeviceConfig
humanReadableTarget: humanReadableConfigChanges
})
return
if !_.isUndefined(current['RESIN_HOST_LOG_TO_DISPLAY'])
if !_.isEmpty(target['RESIN_HOST_LOG_TO_DISPLAY']) && checkTruthy(current['RESIN_HOST_LOG_TO_DISPLAY']) != checkTruthy(target['RESIN_HOST_LOG_TO_DISPLAY'])
steps.push({
action: 'setLogToDisplay'
target: target['RESIN_HOST_LOG_TO_DISPLAY']
})
if !checkTruthy(offlineMode) &&
!_.isEmpty(target['RESIN_SUPERVISOR_VPN_CONTROL']) &&
checkTruthy(current['RESIN_SUPERVISOR_VPN_CONTROL']) != checkTruthy(target['RESIN_SUPERVISOR_VPN_CONTROL'])
@ -255,35 +236,6 @@ module.exports = class DeviceConfig
conf[keyValue[1]] = keyValue[2]
return @bootConfigToEnv(conf)
getLogToDisplay: ->
systemd.serviceActiveState(logToDisplayServiceName)
.then (activeState) ->
return activeState not in [ 'inactive', 'deactivating' ]
.catchReturn(UnitNotLoadedError, null)
setLogToDisplay: (val) =>
Promise.try =>
enable = checkTruthy(val)
if !enable?
throw new Error("Invalid value in call to setLogToDisplay: #{val}")
@getLogToDisplay()
.then (currentState) ->
if !currentState? or currentState == enable
return false
if enable
systemd.startService(logToDisplayServiceName)
.then ->
systemd.enableService(logToDisplayServiceName)
.return(true)
else
systemd.stopService(logToDisplayServiceName)
.then ->
systemd.disableService(logToDisplayServiceName)
.return(true)
.tap (changed) =>
if changed
@rebootRequired = true
setBootConfig: (deviceType, target) =>
Promise.try =>
conf = @envToBootConfig(target)

5
test/05-device-state.spec.coffee
View File

@ -13,7 +13,6 @@ Config = require('../src/config')
Service = require '../src/compose/service'
mockedInitialConfig = {
'RESIN_HOST_LOG_TO_DISPLAY': '1'
'RESIN_SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'RESIN_SUPERVISOR_DELTA': 'false'
'RESIN_SUPERVISOR_DELTA_APPLY_TIMEOUT': ''
@ -32,7 +31,6 @@ testTarget1 = {
name: 'aDevice'
config: {
'RESIN_HOST_CONFIG_gpu_mem': '256'
'RESIN_HOST_LOG_TO_DISPLAY': '0'
'RESIN_SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'RESIN_SUPERVISOR_DELTA': 'false'
'RESIN_SUPERVISOR_DELTA_APPLY_TIMEOUT': ''
@ -78,7 +76,6 @@ testTarget2 = {
name: 'aDeviceWithDifferentName'
config: {
'RESIN_HOST_CONFIG_gpu_mem': '512'
'RESIN_HOST_LOG_TO_DISPLAY': '1'
}
apps: {
'1234': {
@ -115,7 +112,6 @@ testTargetWithDefaults2 = {
name: 'aDeviceWithDifferentName'
config: {
'RESIN_HOST_CONFIG_gpu_mem': '512'
'RESIN_HOST_LOG_TO_DISPLAY': '1'
'RESIN_SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'RESIN_SUPERVISOR_DELTA': 'false'
'RESIN_SUPERVISOR_DELTA_APPLY_TIMEOUT': ''
@ -152,7 +148,6 @@ testTargetInvalid = {
name: 'aDeviceWithDifferentName'
config: {
'RESIN_HOST_CONFIG_gpu_mem': '512'
'RESIN_HOST_LOG_TO_DISPLAY': '1'
}
apps: [
{