Graceful shutdown with Stop(), resolves #99, #105

bot.go

@@ -54,6 +54,7 @@ type Bot struct {
 
 	Errors   chan error
 	handlers map[string]interface{}
+	stop     chan struct{}
 }
 
 // Settings represents a utility struct for passing certain
@@ -137,7 +138,8 @@ func (b *Bot) Start() {
 		panic("telebot: can't start without a poller")
 	}
 
-	go b.Poller.Poll(b, b.Updates)
+	b.stop = make(chan struct{})
+	go b.Poller.Poll(b, b.Updates, b.stop)
 
 	for upd := range b.Updates {
 		if upd.Message != nil {
@@ -350,6 +352,11 @@ func (b *Bot) handleMedia(m *Message) bool {
 	return false
 }
 
+// Stop gracefully shuts the poller down.
+func (b *Bot) Stop() {
+	close(b.stop)
+}
+
 // Send accepts 2+ arguments, starting with destination chat, followed by
 // some Sendable (or string!) and optional send options.
 //

poller.go

@@ -15,7 +15,7 @@ type Poller interface {
 	// Poll is supposed to take the bot object
 	// subscription channel and start polling
 	// for Updates immediately.
-	Poll(b *Bot, dest chan Update)
+	Poll(b *Bot, updates chan Update, stop chan struct{})
 }
 
 // MiddlewarePoller is a special kind of poller that acts
@@ -40,19 +40,26 @@ func Middleware(p Poller, filter func(*Update) bool) *MiddlewarePoller {
 }
 
 // Poll sieves updates through middleware filter.
-func (p *MiddlewarePoller) Poll(b *Bot, dest chan Update) {
+func (p *MiddlewarePoller) Poll(b *Bot, dest chan Update, stop chan struct{}) {
 	cap := 1
 	if p.Capacity > 1 {
 		cap = p.Capacity
 	}
 
 	middle := make(chan Update, cap)
+	stop2 := make(chan struct{})
 
-	go p.Poller.Poll(b, middle)
+	go p.Poller.Poll(b, middle, stop2)
 
-	for upd := range middle {
+	for {
-		if p.filter(&upd) {
+		select {
-			dest <- upd
+		case <-stop:
+			close(stop2)
+			return
+		case upd := <-middle:
+			if p.filter(&upd) {
+				dest <- upd
+			}
 		}
 	}
 }
@@ -63,20 +70,25 @@ type LongPoller struct {
 }
 
 // Poll does long polling.
-func (p *LongPoller) Poll(b *Bot, dest chan Update) {
+func (p *LongPoller) Poll(b *Bot, dest chan Update, stop chan struct{}) {
 	var latestUpd int
 
 	for {
-		updates, err := b.getUpdates(latestUpd+1, p.Timeout)
+		select {
+		case <-stop:
+			return
+		default:
+			updates, err := b.getUpdates(latestUpd+1, p.Timeout)
 
-		if err != nil {
+			if err != nil {
-			b.debug(errors.Wrap(err, "getUpdates() failed"))
+				b.debug(errors.Wrap(err, "getUpdates() failed"))
-			continue
+				continue
-		}
+			}
 
-		for _, update := range updates {
+			for _, update := range updates {
-			latestUpd = update.ID
+				latestUpd = update.ID
-			dest <- update
+				dest <- update
+			}
 		}
 	}
 }