Move the connectivity check into utils.

This commit is contained in:
Pagan Gazzard 2014-12-10 18:38:37 +00:00 committed by Pablo Carranza Vélez
parent 63f1d66402
commit 2557ebcfc2
2 changed files with 27 additions and 24 deletions

View File

@ -9,32 +9,9 @@ config = require './config'
utils.mixpanelTrack('Supervisor start') utils.mixpanelTrack('Supervisor start')
connectivityState = true # Used to prevent multiple messages when disconnected
ensureConnected = (continuous = false) ->
utils.checkConnectivity()
.then (connected) ->
if not connected
if connectivityState
console.log('Waiting for connectivity...')
connectivityState = false
interval = setInterval(utils.blink,400)
Promise.delay(2000)
.then ->
# Clear the blinks after 2 second
clearInterval(interval)
ensureConnected(continuous)
else
if not connectivityState
console.log('Internet Connectivity: OK')
connectivityState = true
if continuous
setTimeout(->
ensureConnected(continuous)
, 10 * 1000) # Every 10 seconds perform this check.
console.log('Starting connectivity check..') console.log('Starting connectivity check..')
ensureConnected(true) utils.connectivityCheck(true)
knex('config').select('value').where(key: 'uuid').then ([ uuid ]) -> knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
if not uuid?.value if not uuid?.value

View File

@ -5,6 +5,8 @@ config = require './config'
mixpanel = require 'mixpanel' mixpanel = require 'mixpanel'
request = require './request' request = require './request'
utils = exports
# Parses package.json and returns resin-supervisor's version # Parses package.json and returns resin-supervisor's version
exports.supervisorVersion = require('../package.json').version exports.supervisorVersion = require('../package.json').version
@ -72,3 +74,27 @@ exports.checkConnectivity = ->
return response.statusCode in [ 200, 304 ] return response.statusCode in [ 200, 304 ]
.catch -> .catch ->
return false return false
exports.connectivityCheck = do ->
connectivityState = true # Used to prevent multiple messages when disconnected
(continuous = false) ->
utils.checkConnectivity()
.then (connected) ->
if not connected
if connectivityState
console.log('Waiting for connectivity...')
connectivityState = false
interval = setInterval(utils.blink,400)
Promise.delay(2000)
.then ->
# Clear the blinks after 2 second
clearInterval(interval)
utils.connectivityCheck(continuous)
else
if not connectivityState
console.log('Internet Connectivity: OK')
connectivityState = true
if continuous
setTimeout(->
utils.connectivityCheck(continuous)
, 10 * 1000) # Every 10 seconds perform this check.