Cleanup channels if engine dies uncleanly

Also add sample bot demonstrating timed messages

conversation/conversation.go

@@ -51,6 +51,11 @@ func (c *Conversation) Start(ctx context.Context) {
 func (c *Conversation) LaunchEngine(ctx context.Context) {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
+	defer func() {
+		logrus.Debug("Closing engine queues")
+		close(c.engineQueues.ReadQ)
+		close(c.engineQueues.WriteQ)
+	}()
 
 	stdin, stdout, stderr, err := c.engine.Setup(ctx)
 	if err != nil {
@@ -108,10 +113,6 @@ func (c *Conversation) LaunchEngine(ctx context.Context) {
 		logrus.Error("Engine failed:", err)
 		return
 	}
-
-	// Close engine queues
-	close(c.engineQueues.ReadQ)
-	close(c.engineQueues.WriteQ)
 }
 
 func (c *Conversation) Post(m *message.Message) {

conversation/manager.go

@@ -294,8 +294,8 @@ func (cm *Manager) GetConversations(ctx context.Context, m *message.Message) []*
 						conversations = append(conversations, &c)
 						logrus.Debugf("New channel conversation with %s: %+v", config.Name, c)
 					} else {
-						logrus.Debugf("Ignoring trigger as bot already active: channel='%s' msg='%s' trigger='%s'",
-							c.channelName, m.Text, re.String())
+						logrus.Debugf("Ignoring trigger as bot already active: %s: channel='%s' msg='%s' trigger='%s'",
+							config.Name, c.channelName, m.Text, re.String())
 					}
 				}
 

examples/cuckoobot/Makefile

@@ -0,0 +1,16 @@
+CONFIG_DIR = $(HOME)/teabot-engines
+
+all:
+	@echo Run \"make install\" to install the cuckoobot engine
+
+install: $(CONFIG_DIR) $(CONFIG_DIR)/cuckoobot.yaml $(CONFIG_DIR)/cuckoobot.sh
+
+$(CONFIG_DIR)/cuckoobot.yaml: cuckoobot.yaml.tmpl
+	sed -e 's|@CONFIG_DIR@|$(CONFIG_DIR)|' $< > $@
+
+$(CONFIG_DIR)/cuckoobot.sh: cuckoobot.sh
+	cp $< $@
+	chmod 755 $@
+
+$(CONFIG_DIR):
+	mkdir -p $@

examples/cuckoobot/README.md

@@ -0,0 +1,19 @@
+## Basic bot engine
+
+A simple bot which prints the message "cuckoo" on the hour every hour in any
+channel it is invited into.
+
+### Installation
+
+```
+make install
+```
+
+This copies the bot's config as well as the bot script to the
+default config directory: `~/teabot-engines`.
+
+If `teabot` is already running, make it reload its engines:
+
+```
+pkill -HUP teabot
+```

examples/cuckoobot/cuckoobot.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+while :; do
+	# Say cuckoo every hour
+	if ! (( `date +'%M'` % 60 )); then
+		echo "cuckoo"
+	fi
+	sleep 60
+done

examples/cuckoobot/cuckoobot.yaml.tmpl

@@ -0,0 +1,3 @@
+handler: @CONFIG_DIR@/cuckoobot.sh
+threaded: false
+direct-messages-only: false