starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fluksod + heartbeat] simplify WAN_ENABLED and LAN_ENABLED logic

This commit is contained in:
Bart Van Der Meerssche 2011-04-28 13:54:29 +02:00
parent 9e396e66ad
commit 442780f86a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
View File

@ -52,8 +52,7 @@ local O_RDWR_CREAT = nixio.open_flags('rdwr', 'creat')
local POLLIN = nixio.poll_flags('in') local POLLIN = nixio.poll_flags('in')
-- set WAN parameters -- set WAN parameters
local WAN_ENABLED = true local WAN_ENABLED = (FLUKSO.daemon.enable_wan_branch == '1')
if tonumber(FLUKSO.daemon.enable_wan_branch) == 0 then WAN_ENABLED = false end
local TIMESTAMP_MIN = 1234567890 local TIMESTAMP_MIN = 1234567890
local WAN_INTERVAL = 300 local WAN_INTERVAL = 300
@ -78,8 +77,7 @@ local USER_AGENT = 'Fluksometer v' .. FLUKSO_VERSION
local CACERT = FLUKSO.daemon.cacert local CACERT = FLUKSO.daemon.cacert
-- set LAN parameters -- set LAN parameters
local LAN_ENABLED = true local LAN_ENABLED = (FLUKSO.daemon.enable_lan_branch == '1')
if tonumber(FLUKSO.daemon.enable_lan_branch) == 0 then LAN_ENABLED = false end
local LAN_POLISH_CUTOFF = 60 local LAN_POLISH_CUTOFF = 60
local LAN_PUBLISH_PATH = DAEMON_PATH .. '/sensor' local LAN_PUBLISH_PATH = DAEMON_PATH .. '/sensor'

3
mote/v2/openwrt/package/flukso/luasrc/heartbeat.lua
View File

@ -41,8 +41,7 @@ local httpclient = require 'luci.httpclient'
local FLUKSO = uci:get_all('flukso') local FLUKSO = uci:get_all('flukso')
-- WAN settings -- WAN settings
local WAN_ENABLED = true local WAN_ENABLED = (FLUKSO.daemon.enable_wan_branch == '1')
if tonumber(FLUKSO.daemon.enable_wan_branch) == 0 then WAN_ENABLED = false end
local WAN_BASE_URL = FLUKSO.daemon.wan_base_url .. 'device/' local WAN_BASE_URL = FLUKSO.daemon.wan_base_url .. 'device/'
local WAN_KEY = '0123456789abcdef0123456789abcdef' local WAN_KEY = '0123456789abcdef0123456789abcdef'