ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-30 22:34:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #317 from resin-io/fix-set-device-name

Browse Source 
Properly set device name, and set undefined arguments to setConfig as null
This commit is contained in:
Pablo Carranza Vélez 2016-10-13 18:06:44 -03:00 committed by GitHub
commit fece945b54
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
* Properly set device name, and set undefined arguments to setConfig as null [Pablo]
# v2.6.2
* Updated knex to ~0.12.3

2
src/application.coffee
View File

@ -594,7 +594,7 @@ application.update = update = (force) ->
.then ({ local, dependent }) ->
proxyvisor.fetchAndSetTargetsForDependentApps(dependent, fetch, apiKey)
.then ->
utils.setConfig('name', deviceName) if local.name != deviceName
utils.setConfig('name', local.name) if local.name != deviceName
.then ->
parseEnvAndFormatRemoteApps(local.apps, uuid, apiKey)
.then (remoteApps) ->

2
src/utils.coffee
View File

@ -150,7 +150,7 @@ exports.getConfig = getConfig = (key) ->
.then ([ conf ]) ->
return conf?.value
exports.setConfig = (key, value) ->
exports.setConfig = (key, value = null) ->
knex('config').update({ value }).where({ key })
.then (n) ->
knex('config').insert({ key, value }) if n == 0