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

fix: Run db log cleanup on init - after migrations

Browse Source 
Before this change the first time the cleanup code runs would be before
the migrations have had a chance to execute. This change makes it so
that the cleanup code always runs once the migrations have finished.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-04-16 09:22:52 +01:00
parent 42aaf81d0b
commit 9fae4bab62
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/application-manager.coffee
View File

@ -75,19 +75,6 @@ module.exports = class ApplicationManager extends EventEmitter
@_targetVolatilePerImageId = {}
@_containerStarted = {}
# Rather than relying on removing out of data database entries when we're no
# longer using them, set a task that runs periodically to clear out the database
# This has the advantage that if for some reason a container is removed while the
# supervisor is down, we won't have zombie entries in the db
setInterval =>
@docker.listContainers(all: true).then (containers) =>
@logger.clearOutOfDateDBLogs(_.map(containers, 'Id'))
# Once a day
, 1000 * 60 * 60 * 24
# But also run it in the background on startup
@docker.listContainers(all: true).then (containers) =>
@logger.clearOutOfDateDBLogs(_.map(containers, 'Id'))
@config.on 'change', (changedConfig) =>
if changedConfig.appUpdatePollInterval
@images.appUpdatePollInterval = changedConfig.appUpdatePollInterval
@ -201,6 +188,20 @@ module.exports = class ApplicationManager extends EventEmitter
@images.appUpdatePollInterval = interval
@images.cleanupDatabase()
.then =>
cleanup = =>
@docker.listContainers(all: true).then (containers) =>
@logger.clearOutOfDateDBLogs(_.map(containers, 'Id'))
# Rather than relying on removing out of date database entries when we're no
# longer using them, set a task that runs periodically to clear out the database
# This has the advantage that if for some reason a container is removed while the
# supervisor is down, we won't have zombie entries in the db
# Once a day
setInterval(cleanup, 1000 * 60 * 60 * 24)
# But also run it in on startup
cleanup()
.then =>
@localModeManager.init()
.then =>
@services.attachToRunning()