Skip to content

Commit

Permalink
move all backoff logic to process object
Browse files Browse the repository at this point in the history
  • Loading branch information
telent committed Apr 22, 2021
1 parent f549d81 commit 2c8ddf2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
9 changes: 3 additions & 6 deletions pppoe.fnl
Expand Up @@ -7,7 +7,6 @@
(fn f. [fmt ...]
(string.format fmt ...))

(fn now [] (process.clock))
(fn nil? [x] (= x nil))

(fn pppoe-daemon [transport-device ppp-device]
Expand All @@ -19,21 +18,19 @@
ipstate-script
ipstate-script))]
(each [event (event.next-event transport-device pppd)]
(when (and (not (process.running? pppd))
(nil? pppd.backoff-until))
(when (not (process.running? pppd))
(pppd:backoff))
(when (and (not (process.running? pppd))
(netdev.link-up? transport-device)
pppd.backoff-until
(<= pppd.backoff-until (now)))
(pppd:backoff-expired?))
(process.join (process.new-process
(f. "ifconfig %s up"
(netdev.device-name transport-device))))
(process.start-process pppd))
(when (and (process.running? pppd)
(not (netdev.link-up? transport-device)))
(process.stop-process pppd))
(when (and (ppp.up? ppp-device) (> pppd.backoff-interval 1))
(when (ppp.up? ppp-device)
(pppd:aver-health))
)))

Expand Down
8 changes: 6 additions & 2 deletions tests/pppoe-test.fnl
Expand Up @@ -46,8 +46,12 @@
"backoff-interval" 1
:backoff
(fn [p]
(set p.backoff-until (+ (clock) p.backoff-interval))
(set p.backoff-interval (* 2 p.backoff-interval)))
(when (= nil p.backoff-until)
(set p.backoff-until (+ (clock) p.backoff-interval))
(set p.backoff-interval (* 2 p.backoff-interval))))
"backoff-expired?"
(fn [p]
(and p.backoff-until (<= p.backoff-until (clock))))
"aver-health" (fn [p] (set p.backoff-interval 1))
})

Expand Down

0 comments on commit 2c8ddf2

Please sign in to comment.