lib/time: calculate the next event on Scheduler run

This allow user to call the Next method, to know the next time the
scheduler will be triggered, after receiving the event.

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/time/scheduler.go b/lib/time/scheduler.go
index c23e0cb2..cb5d6d8d 100644
--- a/lib/time/scheduler.go
+++ b/lib/time/scheduler.go
@@ -568,15 +568,19 @@ func (sch *Scheduler) run() {
 	for {
 		select {
 		case <-ticker.C:
-			// Notify the user and calculate the next event.
-			select {
-			case sch.c <- sch.next:
-			default:
-			}
+			// Calculate the next event and notify user.
+			// This will allow user to call the Next method after
+			// receiving the event.
+			var now = sch.next
 
 			sch.calcNext(Now().UTC())
 			ticker.Reset(sch.nextDuration)
 
+			select {
+			case sch.c <- now:
+			default:
+			}
+
 		case <-sch.cstop:
 			ticker.Stop()
 			// Send ACK back to the stopper.