Make sure the next standup is scheduled

2 files changed, 10 insertions, 3 deletions

diff --git a/warmachine/addons/standup.py b/warmachine/addons/standup.py
index adb7694..21d05e2 100644..100755
--- a/warmachine/addons/standup.py
+++ b/warmachine/addons/standup.py
@@ -330,9 +330,9 @@ class StandUpPlugin(WarMachinePlugin):
             else:
                 await self.standup_priv_msg(connection, u, channel)
 
-        # schedule a function to run in 12 hours to clear out this channel from
+        # schedule a function to run in 8 hours to clear out this channel from
         # self.users_awaiting_reply for all `users`.
-        # This is assuming that after 12 hours, nobody cares about the report
+        # This is assuming that after the hours, nobody cares about the report
         # from people who never reported earlier. It will prevent flooding
         # "tomorrow's" response to channels whose standup is scheduled for
         # later.
@@ -340,6 +340,10 @@ class StandUpPlugin(WarMachinePlugin):
                               self.clean_channel_from_waiting_replies, channel,
                               users)
 
+        # Schedule the next standup
+        self.schedule_standup(
+            connection, channel, self.standup_schedules[channel]['time24h'])
+
 
     async def standup_priv_msg(self, connection, user, channel, pester=600,
                                pester_count=0):
diff --git a/warmachine/connections/slack.py b/warmachine/connections/slack.py
index 684aea3..7585c74 100644..100755
--- a/warmachine/connections/slack.py
+++ b/warmachine/connections/slack.py
@@ -32,6 +32,9 @@ class SlackWS(Connection):
         self.user_map = {}     # user info keyed by their slack id
         self.user_nick_to_id = {}  # slack user id mapped to the (nick)name
 
+        #: The nickname of the bot
+        self.nick = ''
+        #: The slack id for the bot
         self.my_id = '000'
 
         self.ws = None
@@ -64,7 +67,7 @@ class SlackWS(Connection):
         return True
 
     def on_hello(self, msg):
-        self.log.info('Connected to Slack')
+        self.log.info('Connected to Slack as {}'.format(self.nick))
         self.STATUS = CONNECTED
         self.start_ping()